remove method refactored