If you could remove those, I can merge it now. Else I will merge once USB NSH is the default.