- cleanup some network related code and try to remove uneeded noise