Removed all Calendar references and replaced by DateTime JodaTime.