Tidy up ClusterMap and put back powerOnTime behavior