Finished removing old network code