Clean up new Toolbar stuff.