Fixed up some of the compositions stuff and killed unused code.