Cleanup, geometry