chaning timeStamp format, still needs to be joda later, cleaning extra dependencies