comments and unused defs removal
Authored by: Jean-Francois Dockes 2018-11-14
Parent(s): [036e1d]
Child(ren): [ea999e]