refactor remove.