removed bs collapse
removed bs collapse
more bs cleanup
Merge branch 'USB'