Cleaning up DateTimeSerializer after merge