BHV-705: code cleanup