Do we need to repeat "cleanup" here? It'd then be called `Cleanup.cleanup_geometry` - don't think we need to repeat the same word again.