Attempt to cleanup cloning geometry