controlbar.js cleanup