Bug 1072118: Ensure that all ClusterMap access uses the prescribed pattern with try/finally
Trivial: Comment out unused VMChoose code
Trivial: Clean up code