Some (ha-ha-ha) code cleanup

Moved StatusClient to Network