Revert "integrate the cluster with the transition class"

This reverts commit 4a06b01c04a2005594114192472ea283d8649ab7.