Removed dependency on moment.js