incremental net cleanup 2

I'm going to split of some changes from #4348 to make review easier and hopefully merging faster :).