diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/TagTableStructure.bsv b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/TagTableStructure.bsv
deleted file mode 100644
index 48b6714..0000000
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/TagTableStructure.bsv
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * @BERI_LICENSE_HEADER_START@
- *
- * Licensed to BERI Open Systems C.I.C. (BERI) under one or more contributor
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.  BERI licenses this
- * file to you under the BERI Hardware-Software License, Version 1.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *   http://www.beri-open-systems.org/legal/license-1-0.txt
- *
- * Unless required by applicable law or agreed to in writing, Work distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * @BERI_LICENSE_HEADER_END@
- */
-
-// This file was generated by the tagsparams.py script
-// 2020-03-24 15:49:40.494187
-
-import Vector::*;
-Vector#(2, Integer) tableStructure = cons(0, cons(64, nil));
-Integer table_end_addr = 'hbffff000;
-Integer table_start_addr = 'hbf7df080;
-Integer covered_start_addr = 'h80000000;
-Integer covered_mem_size  = 'h3fffc000;
diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/TagTableStructure.bsv b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/TagTableStructure.bsv
deleted file mode 100644
index 48b6714..0000000
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/TagTableStructure.bsv
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * @BERI_LICENSE_HEADER_START@
- *
- * Licensed to BERI Open Systems C.I.C. (BERI) under one or more contributor
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.  BERI licenses this
- * file to you under the BERI Hardware-Software License, Version 1.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *   http://www.beri-open-systems.org/legal/license-1-0.txt
- *
- * Unless required by applicable law or agreed to in writing, Work distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * @BERI_LICENSE_HEADER_END@
- */
-
-// This file was generated by the tagsparams.py script
-// 2020-03-24 15:49:40.494187
-
-import Vector::*;
-Vector#(2, Integer) tableStructure = cons(0, cons(64, nil));
-Integer table_end_addr = 'hbffff000;
-Integer table_start_addr = 'hbf7df080;
-Integer covered_start_addr = 'h80000000;
-Integer covered_mem_size  = 'h3fffc000;
diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_bluesim/TagTableStructure.bsv b/builds/RV64ACDFIMSUxCHERI_Toooba_bluesim/TagTableStructure.bsv
deleted file mode 100644
index 48b6714..0000000
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_bluesim/TagTableStructure.bsv
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * @BERI_LICENSE_HEADER_START@
- *
- * Licensed to BERI Open Systems C.I.C. (BERI) under one or more contributor
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.  BERI licenses this
- * file to you under the BERI Hardware-Software License, Version 1.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *   http://www.beri-open-systems.org/legal/license-1-0.txt
- *
- * Unless required by applicable law or agreed to in writing, Work distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * @BERI_LICENSE_HEADER_END@
- */
-
-// This file was generated by the tagsparams.py script
-// 2020-03-24 15:49:40.494187
-
-import Vector::*;
-Vector#(2, Integer) tableStructure = cons(0, cons(64, nil));
-Integer table_end_addr = 'hbffff000;
-Integer table_start_addr = 'hbf7df080;
-Integer covered_start_addr = 'h80000000;
-Integer covered_mem_size  = 'h3fffc000;
diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_verilator/TagTableStructure.bsv b/builds/RV64ACDFIMSUxCHERI_Toooba_verilator/TagTableStructure.bsv
deleted file mode 100644
index 48b6714..0000000
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_verilator/TagTableStructure.bsv
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * @BERI_LICENSE_HEADER_START@
- *
- * Licensed to BERI Open Systems C.I.C. (BERI) under one or more contributor
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.  BERI licenses this
- * file to you under the BERI Hardware-Software License, Version 1.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *   http://www.beri-open-systems.org/legal/license-1-0.txt
- *
- * Unless required by applicable law or agreed to in writing, Work distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * @BERI_LICENSE_HEADER_END@
- */
-
-// This file was generated by the tagsparams.py script
-// 2020-03-24 15:49:40.494187
-
-import Vector::*;
-Vector#(2, Integer) tableStructure = cons(0, cons(64, nil));
-Integer table_end_addr = 'hbffff000;
-Integer table_start_addr = 'hbf7df080;
-Integer covered_start_addr = 'h80000000;
-Integer covered_mem_size  = 'h3fffc000;