remove crazy handler code