[OE-4342] fuzzy clean up