removed old stuff
Re-worked network manager