Bug 21336: Adjust cleanup_database.pl