The cleanup itself is in [1/7]. Then there are some patches fixing issues I came across while testing the patch (text mode, wifi, vlan, bonding, no link). And a bit more of tui improvement and code consolidation in [6/7].