[OE-2609] clean up