progress on removing lookups