Bug Fix: Cleanup loop breaks because hashtable is modified.