Change db cleanup to database cleaner. Less events to trigger cleanup. (WIP)