Commented out some unnecessary queries