Geometry cleanups -- Remove unused, deprecated, code.