Remove dummy handler