minor work on cleaning up network stuffs