Clean up for CM merge