Recovered Network usage and did a bit of cleaning up

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>