Remove some unreachable code