Stripped out hash table stuff