Some cleansing after merge