Removed SurfaceFactory and RegionFactory