SVY-7568 code clean