elements/sidebar cleanup