unnecessary queries was removed