removed extraneous hashtable