Buildfix + cleanup

Fixed the build errors in NetworkManager and removed unused files