Remove extra query include