Properly remove handlers