Remove Block, BlockInstance from ProtoGeometry, small changes to CoordinateSystem