Refactoring remove composition