more composition cleanup