Merge "Clean up hash set"