[OE-4753] cleanup