Wrap-up

* No more GetXXX() method when a simple map will do.
* No XXXAll() method when one can use the map.