diff --git a/src/odb/src/db/dbModInstITermItr.cpp b/src/odb/src/db/dbModInstITermItr.cpp
deleted file mode 100644
index b3d29347cca..00000000000
--- a/src/odb/src/db/dbModInstITermItr.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2019, Nefelus Inc
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Cpp
-#include "dbModInstITermItr.h"
-
-#include "dbModITerm.h"
-#include "dbTable.h"
-
-namespace odb {
-
-////////////////////////////////////////////////////////////////////
-//
-// dbModInstITermItr - Methods
-//
-////////////////////////////////////////////////////////////////////
-
-bool dbModInstITermItr::reversible()
-{
-  return true;
-}
-
-bool dbModInstITermItr::orderReversed()
-{
-  return true;
-}
-
-void dbModInstITermItr::reverse(dbObject* parent)
-{
-}
-
-uint dbModInstITermItr::sequential()
-{
-  return 0;
-}
-
-uint dbModInstITermItr::size(dbObject* parent)
-{
-  uint id;
-  uint cnt = 0;
-
-  for (id = dbModInstITermItr::begin(parent);
-       id != dbModInstITermItr::end(parent);
-       id = dbModInstITermItr::next(id))
-    ++cnt;
-
-  return cnt;
-}
-
-uint dbModInstITermItr::begin(dbObject* parent)
-{
-  // User Code Begin begin
-  _dbModInst* modinst = (_dbModInst*) parent;
-  return modinst->_moditerms;
-  // User Code End begin
-}
-
-uint dbModInstITermItr::end(dbObject* /* unused: parent */)
-{
-  return 0;
-}
-
-uint dbModInstITermItr::next(uint id, ...)
-{
-  // User Code Begin next
-  _dbModInstITerm* iterm = _moditerm_tbl->getPtr(id);
-  return iterm->_next_entry;
-  // User Code End next
-}
-
-dbObject* dbModInstITermItr::getObject(uint id, ...)
-{
-  return _moditerm_tbl->getPtr(id);
-}
-}  // namespace odb
-   // Generator Code End Cpp
diff --git a/src/odb/src/db/dbModInstITermItr.h b/src/odb/src/db/dbModInstITermItr.h
deleted file mode 100644
index 416ce113646..00000000000
--- a/src/odb/src/db/dbModInstITermItr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2020, The Regents of the University of California
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Header
-#pragma once
-
-#include "odb/dbIterator.h"
-#include "odb/odb.h"
-
-namespace odb {
-class _dbModITerm;
-
-template <class T>
-class dbTable;
-
-class dbModInstITermItr : public dbIterator
-{
- public:
-  dbModInstITermItr(dbTable<_dbModITerm>* moditerm_tbl)
-  {
-    _moditerm_tbl = moditerm_tbl;
-  }
-
-  bool reversible() override;
-  bool orderReversed() override;
-  void reverse(dbObject* parent) override;
-  uint sequential() override;
-  uint size(dbObject* parent) override;
-  uint begin(dbObject* parent) override;
-  uint end(dbObject* parent) override;
-  uint next(uint id, ...) override;
-  dbObject* getObject(uint id, ...) override;
-
- private:
-  dbTable<_dbModITerm>* _moditerm_tbl;
-};
-
-}  // namespace odb
-   // Generator Code End Header
diff --git a/src/odb/src/db/dbModInstModITermItr.cpp b/src/odb/src/db/dbModInstModITermItr.cpp
deleted file mode 100644
index 55644399514..00000000000
--- a/src/odb/src/db/dbModInstModITermItr.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2019, Nefelus Inc
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Cpp
-#include "dbModInstModITermItr.h"
-
-#include "dbModITerm.h"
-#include "dbTable.h"
-
-namespace odb {
-
-////////////////////////////////////////////////////////////////////
-//
-// dbModInstModITermItr - Methods
-//
-////////////////////////////////////////////////////////////////////
-
-bool dbModInstModITermItr::reversible()
-{
-  return true;
-}
-
-bool dbModInstModITermItr::orderReversed()
-{
-  return true;
-}
-
-void dbModInstModITermItr::reverse(dbObject* parent)
-{
-}
-
-uint dbModInstModITermItr::sequential()
-{
-  return 0;
-}
-
-uint dbModInstModITermItr::size(dbObject* parent)
-{
-  uint id;
-  uint cnt = 0;
-
-  for (id = dbModInstModITermItr::begin(parent);
-       id != dbModInstModITermItr::end(parent);
-       id = dbModInstModITermItr::next(id)) {
-    ++cnt;
-  }
-
-  return cnt;
-}
-
-uint dbModInstModITermItr::begin(dbObject* parent)
-{
-}
-
-uint dbModInstModITermItr::end(dbObject* /* unused: parent */)
-{
-  return 0;
-}
-
-uint dbModInstModITermItr::next(uint id, ...)
-{
-}
-
-dbObject* dbModInstModITermItr::getObject(uint id, ...)
-{
-  return _moditerm_tbl->getPtr(id);
-}
-}  // namespace odb
-   // Generator Code End Cpp
\ No newline at end of file
diff --git a/src/odb/src/db/dbModInstModITermItr.h b/src/odb/src/db/dbModInstModITermItr.h
deleted file mode 100644
index 3c8c4d219c7..00000000000
--- a/src/odb/src/db/dbModInstModITermItr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2020, The Regents of the University of California
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Header
-#pragma once
-
-#include "odb/dbIterator.h"
-#include "odb/odb.h"
-
-namespace odb {
-class _dbModITerm;
-
-template <class T>
-class dbTable;
-
-class dbModInstModITermItr : public dbIterator
-{
- public:
-  dbModInstModITermItr(dbTable<_dbModITerm>* moditerm_tbl)
-  {
-    _moditerm_tbl = moditerm_tbl;
-  }
-
-  bool reversible() override;
-  bool orderReversed() override;
-  void reverse(dbObject* parent) override;
-  uint sequential() override;
-  uint size(dbObject* parent) override;
-  uint begin(dbObject* parent) override;
-  uint end(dbObject* parent) override;
-  uint next(uint id, ...) override;
-  dbObject* getObject(uint id, ...) override;
-
- private:
-  dbTable<_dbModITerm>* _moditerm_tbl;
-};
-
-}  // namespace odb
-   // Generator Code End Header
diff --git a/src/odb/src/db/dbModuleBTermItr.cpp b/src/odb/src/db/dbModuleBTermItr.cpp
deleted file mode 100644
index 95d66617645..00000000000
--- a/src/odb/src/db/dbModuleBTermItr.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2019, Nefelus Inc
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Cpp
-#include "dbModuleBTermItr.h"
-
-#include "dbModBTerm.h"
-#include "dbTable.h"
-
-namespace odb {
-
-////////////////////////////////////////////////////////////////////
-//
-// dbModuleBTermItr - Methods
-//
-////////////////////////////////////////////////////////////////////
-
-bool dbModuleBTermItr::reversible()
-{
-  return true;
-}
-
-bool dbModuleBTermItr::orderReversed()
-{
-  return true;
-}
-
-void dbModuleBTermItr::reverse(dbObject* parent)
-{
-}
-
-uint dbModuleBTermItr::sequential()
-{
-  return 0;
-}
-
-uint dbModuleBTermItr::size(dbObject* parent)
-{
-  uint id;
-  uint cnt = 0;
-
-  for (id = dbModuleBTermItr::begin(parent);
-       id != dbModuleBTermItr::end(parent);
-       id = dbModuleBTermItr::next(id))
-    ++cnt;
-
-  return cnt;
-}
-
-uint dbModuleBTermItr::begin(dbObject* parent)
-{
-  // User Code Begin begin
-  _dbModule* _module = (_dbModule*) parent;
-  _dbModBTerm* _modbterm = _module->_modbterms;
-  // User Code End begin
-}
-
-uint dbModuleBTermItr::end(dbObject* /* unused: parent */)
-{
-  return 0;
-}
-
-uint dbModuleBTermItr::next(uint id, ...)
-{
-  // User Code Begin next
-  _dbModITerm* modbterm = _modbterm_tbl->getPtr(id);
-  return modbterm->_next_entry;
-  // User Code End next
-}
-
-dbObject* dbModuleBTermItr::getObject(uint id, ...)
-{
-  return _modbterm_tbl->getPtr(id);
-}
-}  // namespace odb
-   // Generator Code End Cpp
diff --git a/src/odb/src/db/dbModuleBTermItr.h b/src/odb/src/db/dbModuleBTermItr.h
deleted file mode 100644
index 81af6d464e7..00000000000
--- a/src/odb/src/db/dbModuleBTermItr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2020, The Regents of the University of California
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Header
-#pragma once
-
-#include "odb/dbIterator.h"
-#include "odb/odb.h"
-
-namespace odb {
-class _dbModBTerm;
-
-template <class T>
-class dbTable;
-
-class dbModuleBTermItr : public dbIterator
-{
- public:
-  dbModuleBTermItr(dbTable<_dbModBTerm>* modbterm_tbl)
-  {
-    _modbterm_tbl = modbterm_tbl;
-  }
-
-  bool reversible() override;
-  bool orderReversed() override;
-  void reverse(dbObject* parent) override;
-  uint sequential() override;
-  uint size(dbObject* parent) override;
-  uint begin(dbObject* parent) override;
-  uint end(dbObject* parent) override;
-  uint next(uint id, ...) override;
-  dbObject* getObject(uint id, ...) override;
-
- private:
-  dbTable<_dbModBTerm>* _modbterm_tbl;
-};
-
-}  // namespace odb
-   // Generator Code End Header
diff --git a/src/odb/src/db/dbModuleModInstITermItr.cpp b/src/odb/src/db/dbModuleModInstITermItr.cpp
deleted file mode 100644
index 92a143681d2..00000000000
--- a/src/odb/src/db/dbModuleModInstITermItr.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2019, Nefelus Inc
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Cpp
-#include "dbModuleModInstITermItr.h"
-
-#include "dbModITerm.h"
-#include "dbModInst.h"
-#include "dbTable.h"
-
-namespace odb {
-
-////////////////////////////////////////////////////////////////////
-//
-// dbModuleModInstITermItr - Methods
-//
-////////////////////////////////////////////////////////////////////
-
-bool dbModuleModInstITermItr::reversible()
-{
-  return true;
-}
-
-bool dbModuleModInstITermItr::orderReversed()
-{
-  return true;
-}
-
-void dbModuleModInstITermItr::reverse(dbObject* parent)
-{
-}
-
-uint dbModuleModInstITermItr::sequential()
-{
-  return 0;
-}
-
-uint dbModuleModInstITermItr::size(dbObject* parent)
-{
-  uint id;
-  uint cnt = 0;
-
-  for (id = dbModuleModInstITermItr::begin(parent);
-       id != dbModuleModInstITermItr::end(parent);
-       id = dbModuleModInstITermItr::next(id))
-    ++cnt;
-
-  return cnt;
-}
-
-uint dbModuleModInstITermItr::begin(dbObject* parent)
-{
-  // User Code Begin begin
-  _dbModInst* _mod_inst = (_dbModInst*) parent;
-  return _mod_inst->_moditerms;
-  // User Code End begin
-}
-
-uint dbModuleModInstITermItr::end(dbObject* /* unused: parent */)
-{
-  return 0;
-}
-
-uint dbModuleModInstITermItr::next(uint id, ...)
-{
-  // User Code Begin next
-  _dbModITerm* moditerm = _moditerm_tbl->getPtr(id);
-  return moditerm->_next_entry;
-  // User Code End next
-}
-
-dbObject* dbModuleModInstITermItr::getObject(uint id, ...)
-{
-  return _moditerm_tbl->getPtr(id);
-}
-}  // namespace odb
-   // Generator Code End Cpp
diff --git a/src/odb/src/db/dbModuleModInstITermItr.h b/src/odb/src/db/dbModuleModInstITermItr.h
deleted file mode 100644
index 89b8c243086..00000000000
--- a/src/odb/src/db/dbModuleModInstITermItr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// BSD 3-Clause License
-//
-// Copyright (c) 2020, The Regents of the University of California
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-//
-// * Neither the name of the copyright holder nor the names of its
-//   contributors may be used to endorse or promote products derived from
-//   this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Generator Code Begin Header
-#pragma once
-
-#include "odb/dbIterator.h"
-#include "odb/odb.h"
-
-namespace odb {
-class _dbModInst;
-
-template <class T>
-class dbTable;
-
-class dbModuleModInstITermItr : public dbIterator
-{
- public:
-  dbModuleModInstITermItr(dbTable<_dbModInst>* moditerm_tbl)
-  {
-    _moditerm_tbl = moditerm_tbl;
-  }
-
-  bool reversible() override;
-  bool orderReversed() override;
-  void reverse(dbObject* parent) override;
-  uint sequential() override;
-  uint size(dbObject* parent) override;
-  uint begin(dbObject* parent) override;
-  uint end(dbObject* parent) override;
-  uint next(uint id, ...) override;
-  dbObject* getObject(uint id, ...) override;
-
- private:
-  dbTable<_dbModInst>* _moditerm_tbl;
-};
-
-}  // namespace odb
-   // Generator Code End Header