Refactored removal