Remove unused handlers