cleanup after samsung merge