Removing pointless query