Cleaned up variable elimination code in ClusterGraph