Remove unneeded modules.
Fix cross-browser toolbar button.