Library Cleanup

Mike, would you please address the first half of my post on composition grouping: