Removing Deprecated Lookup/QueryIdent() Code