Clean up toolbar code