Removed moment.js dependency