Remove unneeded query