Refactored `remove_first`