Remove unnecessary fields from the query