Remove old geometry stuff