CBI-7 - Added missing composer depenencies, and removed unused files and services