Removed a lot of debug code and comments for last commit. Removed a redundant and legacy member from Plane and Sphere.