JDF-282 version 2

JDF-282 more cleanup

JDF-282 more cleanup