Composition refactoring part (1)
Remove composition refactoring
Refactoring