Revert "rm_database"

This reverts commit e07dcd790ba3dcdb2377aa4408abb92ed4418fdd.