Remove extra query