Revert "Composition"

This reverts commit 864d8d2a0d579ba91ec78e682551f98d318e949d.