[COMMIT] Rest of hash-table cleanup (Part 2 of 2)