Remove a bit of old code and unified reachable space clipping