CLOUD-216 renamed activeStack to activeCluster and removed a few unused things