Removed unnecessary queries