removed extra / unnecessary queries