removed and replaced database cleaner