change handling of database cleaner