cleaning up - those are no longer needed since hashtable used anyway