removed moment module dependency and associated code