removed unnecessary queries