cleanup from oppo merge