Restructuring, removed unused network code