Fix: strip out dead code