Fix CollectionView deletion
Improve composer build command defs