Removed isPlane and junk