Changed database cleaner strategy