Removing uneeded query