Added timing logs and cleaned out unused stuff
Merge remote-tracking branch 'origin/master' into player
removed last point in data.js