Remove duplicate config
Proper cleanup of databases