Remove Hash class dependency