Cleand up for CM merge