Remove duplicate query