db cleaner partial commit, #14