delete old toolbar
Merge branch 'brian'