Moved remove into base