OCSADV-191: minor cleanup