diff --git a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AMPLGenerator.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AMPLGenerator.java
index 42fe0d8..bd84cab 100644
--- a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AMPLGenerator.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AMPLGenerator.java
@@ -30,10 +30,7 @@ public class AMPLGenerator {
      * Generate the app's metric list.
      */
     public static List<String> getMetricList(NebulousApp app) {
-        List<String> metrics = new ArrayList<>();
-        app.getRawMetrics().forEach((k, v) -> metrics.add(k));
-        app.getCompositeMetrics().forEach((k, v) -> metrics.add(k));
-        return metrics;
+        return new ArrayList<>(usedMetrics(app));
     }
 
     /**