cleanup.
cherry-picked 4fa24467497decc9d933ca41f5c35bd1be1c796d