some more cleanup after merging docs branch to master