Remove hash lookups