removed unused handlers