Added timing logs and cleaned out unused stuff
Merge remote-tracking branch 'origin/master' into gh-pages