diff --git a/modules.env b/modules.env
index 2e6fde2489..cd7fe1b693 100644
--- a/modules.env
+++ b/modules.env
@@ -29,7 +29,6 @@ OPENSTACK_GIT_ROOT=https://opendev.org
 
 SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v1.2.4"
 SOURCE_MODULES["https://github.com/dalen/puppet-dnsquery"]="2.0.1"
-SOURCE_MODULES["https://github.com/duritong/puppet-sysctl"]="v0.0.11"
 # initfact is a dep of biemond-wildfly
 SOURCE_MODULES["https://github.com/jethrocarr/puppet-initfact"]="1.0.1"
 SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0"
@@ -42,14 +41,13 @@ SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-inifile"]="1.1.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-java_ks"]="1.3.1"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-mysql"]="3.11.0"
-SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-postgresql"]="4.8.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-rabbitmq"]="5.2.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-stdlib"]="4.17.0"
 SOURCE_MODULES["https://github.com/rafaelfelix/puppet-pear"]="1.0.3"
+# Mediawiki uses the memcached module
 SOURCE_MODULES["https://github.com/saz/puppet-memcached"]="v2.6.0"
 SOURCE_MODULES["https://github.com/stankevich/puppet-python"]="1.9.5"
 SOURCE_MODULES["https://github.com/theforeman/puppet-dns"]="4.1.0"
-SOURCE_MODULES["https://github.com/vamsee/puppet-solr"]="0.0.8"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-alternatives"]="0.3.0"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-git_resource"]="0.3.0"
@@ -63,18 +61,18 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origi
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elasticsearch"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master"
+# Storyboard and translate use the jeepyb module
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kibana"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-log_processor"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logstash"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mediawiki"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-meetbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pgsql_backup"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master"
+# Ethercalc uses the redis module
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-reviewday"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-simpleproxy"]="origin/master"