Clean up grain lookups from #10202