Toolbar cleanup.