Refactored removemethods to match add and confirm structure