[OE-4382] clean up