Mass network refactor; dead code removal