Remove the hashmap and the vector
added Cleanup label
added 1 commit
Compare with previous version
mentioned in commit 83b046d9
merged