Fix multiple issues related to integration of components and cleanup See merge request teraflow-h2020/controller!89