Add remove method.
Add remove methods and.
Minor refactoring.