remove unused handlers