Add method to remove handlers