Remove duplicate lookup