diff --git a/src/Main.cxx b/src/Main.cxx
index b25586246..7ba25dad8 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -655,10 +655,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 
 	playlist_list_global_finish();
 
-#ifdef ENABLE_DATABASE
-	mapper_finish();
-#endif
-
 	DeinitFS();
 
 	return EXIT_SUCCESS;
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index ccfd72f7a..c5c3076d0 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -58,11 +58,6 @@ mapper_init(AllocatedPath &&_playlist_dir)
 		mapper_set_playlist_dir(std::move(_playlist_dir));
 }
 
-void
-mapper_finish() noexcept
-{
-}
-
 #ifdef ENABLE_DATABASE
 
 AllocatedPath
diff --git a/src/Mapper.hxx b/src/Mapper.hxx
index bf8ef6ae1..47021faf0 100644
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -37,9 +37,6 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);
 
-void
-mapper_finish() noexcept;
-
 #ifdef ENABLE_DATABASE
 
 /**