Remove redundant lookups