Removed unnecessary use of moment.js