Finally removed Crystal, some composer changes