diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index c911893729655c1d5f0f0c3ad8827946a274ed35..9cab10c7e8120fab64adef7484e9e0732d56379d 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -137,8 +137,7 @@ sieve_tool_init(const char *name, int *argc, char **argv[],
 	enum master_service_flags service_flags =
 		MASTER_SERVICE_FLAG_STANDALONE |
 		MASTER_SERVICE_FLAG_DONT_SEND_STATS |
-		MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME |
-		MASTER_SERVICE_FLAG_DISABLE_SSL_SET;
+		MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME;
 
 	if (no_config)
 		service_flags |= MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS;
@@ -255,7 +254,6 @@ sieve_tool_init_finish(struct sieve_tool *tool, bool init_mailstore,
 			MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES;
 
 	i_zero(&service_input);
-	service_input.module = "mail";
 	service_input.service = tool->name;
 	service_input.username = username;
 
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.c b/src/managesieve-login/managesieve-login-settings-plugin.c
index 7d22e7321825be270270a9dd4abf3deef5c1584b..0a46a7b13d6499f956fa5cf42fcca42b98ed5dc4 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.c
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c
@@ -205,18 +205,6 @@ static void managesieve_login_config_set
 
 static void managesieve_login_config_parser_begin(struct config_parser_context *ctx)
 {	
-	const char *const *module = ctx->modules;
-
-	if ( module != NULL && *module != NULL ) {
-		while ( *module != NULL ) {
-			if ( strcmp(*module, "managesieve-login") == 0 )
-				break;
-			module++;
-		}
-		if ( *module == NULL )
-			return;
-	}
-
 	if ( !capability_dumped ) {
 		(void)capability_dump();
 		capability_dumped = TRUE;
diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index 2d964cf12c33edda93c9435f4e99871473509da6..19d3f06668426213337b6c6589ae850c1826f2fe 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -200,7 +200,6 @@ static void main_stdio_run(const char *username)
 	buffer_t *input_buf;
 
 	i_zero(&input);
-	input.module = "managesieve";
 	input.service = "sieve";
 	input.username =  username != NULL ? username : getenv("USER");
 	if (input.username == NULL && IS_STANDALONE())
@@ -232,7 +231,6 @@ login_request_finished(const struct login_server_request *request,
 	buffer_t input_buf;
 
 	i_zero(&input);
-	input.module = "managesieve";
 	input.service = "sieve";
 	input.local_ip = request->auth_req.local_ip;
 	input.remote_ip = request->auth_req.remote_ip;
@@ -328,13 +326,9 @@ int main(int argc, char *argv[])
 	if (IS_STANDALONE() || getenv("DUMP_CAPABILITY") != NULL) {
 		service_flags |= MASTER_SERVICE_FLAG_STANDALONE |
 				 MASTER_SERVICE_FLAG_STD_CLIENT;
-	} else {
-		service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
-	}
-	if (getenv("DUMP_CAPABILITY") != NULL) {
-		service_flags |= MASTER_SERVICE_FLAG_DONT_SEND_STATS |
-			MASTER_SERVICE_FLAG_DISABLE_SSL_SET;
 	}
+	if (getenv("DUMP_CAPABILITY") != NULL)
+		service_flags |= MASTER_SERVICE_FLAG_DONT_SEND_STATS;
 
 	master_service = master_service_init("managesieve", service_flags,
 					     &argc, &argv, "t:u:");
diff --git a/src/managesieve/managesieve-capabilities.c b/src/managesieve/managesieve-capabilities.c
index 66feec5a4c2c153245f879032b8b20cf4e394a0f..68ddf0f055cdb4d7ec48439969f6f15258ad78ba 100644
--- a/src/managesieve/managesieve-capabilities.c
+++ b/src/managesieve/managesieve-capabilities.c
@@ -8,7 +8,6 @@
 #include "settings-parser.h"
 #include "master-service.h"
 #include "master-service-settings.h"
-#include "master-service-settings-cache.h"
 
 #include "sieve.h"