+ [OES-469] remove redundant code