[OE-4492] Cleanup