toolbar cleanup