Clean up CMLCore