Add removeGeometry functions