Removed Geometry, as it's pointless now.