Sidebar clean up