Removed agent:ssh; removed cm specific templates; adjusted params