Remove dynamic lookups