Feature #2672: Remove uneeded getter. add some comments