Remove old Geometry class and all derived classes and references to them