Moved cluster-ha singleton to complex dependencies and removed ws*