[OE-3301] cleanup