[OEM-255] cleanup