Updating CompositionModifier and Controller to cleanup and fix deleting ended CMs