refactor remove handlers