* cleaned up debugging code and comments
Authored by: mukau 2018-11-30
Parent: [r1130]
Child: [r1132]