removed joda time dependency
removed files
fixing conflicts