First batch of cleanup for gorp_queries->gorq move