simpler better

Updated networking class and redundancies removed