[OE-3941] code clean up