cleanup and gh-pages fix