Update TODO after doing
Fix moment.js dependency