Remove None checks for run_query