[OE-4164] cleanup