Asset-lookup-fix

Cleaned uses of AssetLookup and its derivatives.