BCCVL-124 Minor cleanup