Clean up; added database cleaner