Further dead code removal