[TAC-116] some forgotten refactoring