cleanup from samsung merge