[TENAC-21] minor cleanup