Add moment js and remove garbage