removed network setup wizard
fixed merge conflicts