remove extra query