NCmdLiner 1.0.13125.36 code cleanup