Removed switch, shortened time of network up