Clean up before merging dates_refactoring