diff --git a/management/status_checks.py b/management/status_checks.py
index 18eb3219..a9d0595c 100755
--- a/management/status_checks.py
+++ b/management/status_checks.py
@@ -38,7 +38,6 @@ def get_services():
 		{ "name": "Mail Filters (Sieve/dovecot)", "port": 4190, "public": True, },
 		{ "name": "HTTP Web (nginx)", "port": 80, "public": True, },
 		{ "name": "HTTPS Web (nginx)", "port": 443, "public": True, },
-		{ "name": "Solr Full Text Search (Jetty)", "port": 8080, "public": False, },
 	]
 
 def run_checks(rounded_values, env, output, pool):
diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh
index 454cf27c..e39f8aff 100755
--- a/setup/mail-postfix.sh
+++ b/setup/mail-postfix.sh
@@ -210,6 +210,7 @@ tools/editconf.py /etc/postfix/main.cf \
 tools/editconf.py /etc/default/postgrey \
 	POSTGREY_OPTS=\"'--inet=127.0.0.1:10023 --delay=180 --whitelist-recipients=/etc/postgrey/whitelist_clients'\"
 
+
 # We are going to setup a newer whitelist for postgrey, the version included in the distribution is old
 cat > /etc/cron.daily/mailinabox-postgrey-whitelist << EOF;
 #!/bin/bash
@@ -226,9 +227,6 @@ if [ ! -f /etc/postgrey/whitelist_clients ] || find /etc/postgrey/whitelist_clie
         # before moving it into place
         if [ "\$(file -b --mime-type /tmp/postgrey_whitelist_clients)" == "text/plain" ]; then
             mv /tmp/postgrey_whitelist_clients /etc/postgrey/whitelist_clients
-            if [ -f /root/mailinabox/conf/postgrey_whitelist_clients ] ; then
-               cat /root/mailinabox/conf/postgrey_whitelist_clients >> /etc/postgrey/whitelist_clients
-            fi
             service postgrey restart
 	else
             rm /tmp/postgrey_whitelist_clients
diff --git a/setup/web.sh b/setup/web.sh
index 4ba646e4..ed37e5e3 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -48,12 +48,6 @@ tools/editconf.py /etc/php/7.2/fpm/php.ini -c ';' \
 tools/editconf.py /etc/php/7.2/fpm/php.ini -c ';' \
         default_charset="UTF-8"
 
-# Set higher timeout since searches with Roundcube and Solr may take longer
-# than the default 60 seconds. We will also match Roundcube's timeout to the
-# same value
-tools/editconf.py /etc/php/7.2/fpm/php.ini -c ';' \
-        default_socket_timeout=180
-
 # Switch from the dynamic process manager to the ondemand manager see #1216
 tools/editconf.py /etc/php/7.2/fpm/pool.d/www.conf -c ';' \
 	pm=ondemand
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 28b74576..6cbe55f9 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -108,7 +108,7 @@ cat > $RCM_CONFIG <<EOF;
      'verify_peer_name'  => false,
    ),
  );
-\$config['imap_timeout'] = 180;
+\$config['imap_timeout'] = 15;
 \$config['smtp_server'] = 'tls://127.0.0.1';
 \$config['smtp_port'] = 587;
 \$config['smtp_user'] = '%u';