Remove HashMap class.
Remove HashMap reference.
Merge branch 'local'