Clended code, added database cleaner to specs