removed simplified network files, refactoring