removals, chooser.js fixes