Remove useless case handlers