Networking-related refactoring, clean rule updated in Makefile