Removing MapBoundarySystem as we no longer use it, and it breaks stuff.