cleanup, ready to merge into gh-pages