update USB config, clean-up