2.x Refactor embedded cluster.