Kill unused logic