Initial cleanup of Geometries.