Removed unused code
Removed unused code
Started to using Joda Time