Move remove methods into Model classes