Minor styling and dead code removal
Merge branch 'master' into gh-pages