more home_controller cleanup