PB-661 #comment - code cleanup.

also related to PB-651 & PB-653.