More house-cleaning on netlist. No wn