Convert remaining controller code to use current_user