Clean up sidebar more