Refactor unsafe remove