[OE-2950] code clean up