cleanup
stop exposing internal hash table data structures
make handlers lookup consistent with the new hash table interface