Remove Composistion support

Compositions now in the core (they are not quite working, but they are
there)