SC-67 Get rid of java.util.Date
SC-67 Clean up
SC-67 Joda time update
SC-67 Build fix