Remove references to /base