code cleaning , remove unused references and variables
reworkd dependency to jodatime