Removed JodaTime reference