Remove unused handler