Remove extra unused handler