remove unused handler