Finish removing old network code