Optimize lookup

No. Should I remove it? (@huberp will add it again, right?)