E1S0: drop some dead code