Remove needless query