cleaning up some meter code

Change-Id: Ie901d51cf6ade2c497f90fadb093179404967d13

@@ -18,6 +18,8 @@ package org.onosproject.net.meter;
 import com.google.common.base.Objects;
 import com.google.common.base.Objects;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
 
 
+import static com.google.common.base.MoreObjects.toStringHelper;
+
 /**
 /**
  * A meter key represents a meter uniquely.
  * A meter key represents a meter uniquely.
  */
  */
@@ -57,6 +59,13 @@ public final class MeterKey {
         return Objects.hashCode(deviceId, id);
         return Objects.hashCode(deviceId, id);
     }
     }
 
 
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .add("deviceId", deviceId)
+                .add("meterId", id).toString();
+    }
+
     public static MeterKey key(DeviceId deviceId, MeterId id) {
     public static MeterKey key(DeviceId deviceId, MeterId id) {
         return new MeterKey(deviceId, id);
         return new MeterKey(deviceId, id);
     }
     }

@@ -80,9 +80,6 @@ public class MeterManager extends AbstractListenerProviderRegistry<MeterEvent, M
 
 
     @Activate
     @Activate
     public void activate() {
     public void activate() {
-        /*meterIdCounter = storageService.atomicCounterBuilder()
-                .withName(METERCOUNTERIDENTIFIER)
-                .build();*/
 
 
         store.setDelegate(delegate);
         store.setDelegate(delegate);