[CF-340/cf-343] Minor fix to remove unwanted code