Removed premature optimizations. 

Use a second hashset.