Removed some ancient commented-out stuff
Naming changes and doc updates