[OE-4003] code clean up