refactor remove