remove commented out code
remove unused top level elements
minor fixes for editing all over the place