remove was a lot easier now that the main changes are hooked in