More sidebar clean up #56