gh-4
Refactored the remove method