Updating comments, and removing class files that were created as part of the very first spec but later dropped.