Removed redundant lookups