diff --git a/cp-solver/src/main/java/eu/melodic/upperware/cpsolver/CPSolverApplication.java b/cp-solver/src/main/java/eu/melodic/upperware/cpsolver/CPSolverApplication.java
index 43bd2f922d713c40a649161fe2fafdab45a8a761..46dc9d0f08ec6b33f7b1807bf7449d1fcee5f637 100644
--- a/cp-solver/src/main/java/eu/melodic/upperware/cpsolver/CPSolverApplication.java
+++ b/cp-solver/src/main/java/eu/melodic/upperware/cpsolver/CPSolverApplication.java
@@ -31,7 +31,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @Configuration
 @ComponentScan(basePackages = {"eu.melodic.upperware.cpsolver", "eu.melodic.cache", "eu.melodic.upperware.utilitygenerator"})
 @SpringBootApplication
-@EnableConfigurationProperties({MelodicSecurityProperties.class, CacheProperties.class, PenaltyFunctionProperties.class})
+@EnableConfigurationProperties({MelodicSecurityProperties.class, CacheProperties.class})
 public class CPSolverApplication {
 
     public static void main(String[] args) {
diff --git a/melodic-commons/src/main/java/eu/passage/upperware/commons/model/tools/metadata/CamelMetadata.java b/melodic-commons/src/main/java/eu/passage/upperware/commons/model/tools/metadata/CamelMetadata.java
index e3fbf112dd7edb1abe841d57f580f8160768f142..113ce3c888ad0ff393c03f5bdad0688e0ea16a35 100644
--- a/melodic-commons/src/main/java/eu/passage/upperware/commons/model/tools/metadata/CamelMetadata.java
+++ b/melodic-commons/src/main/java/eu/passage/upperware/commons/model/tools/metadata/CamelMetadata.java
@@ -11,20 +11,17 @@ import java.util.List;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum CamelMetadata {
 
-    CORES("CPU", VariableType.CORES, false, false),
-    RAM("RAM", VariableType.RAM, false,false),
-    STORAGE("Storage", VariableType.STORAGE, false, false),
-    CARDINALITY("Cardinality", VariableType.CARDINALITY, false, false),
-    LATITUDE("latitude", VariableType.LATITUDE, false, false),
-    LONGITUDE("longitude", VariableType.LONGITUDE, false, false),
+    CORES("CPU", VariableType.CORES, false),
+    RAM("RAM", VariableType.RAM, false),
+    STORAGE("Storage", VariableType.STORAGE, false),
+    CARDINALITY("Cardinality", VariableType.CARDINALITY, false),
+    LATITUDE("latitude", VariableType.LATITUDE, false),
+    LONGITUDE("longitude", VariableType.LONGITUDE, false),
 
-    PROVIDER("", VariableType.PROVIDER, false, false),
+    PROVIDER("", VariableType.PROVIDER, false),
     
-    PRICE("Cost", null, true, false),
-    
-    AFFINITY_AWARENESS("AffinityAwareness", null, false, true),
-    DATA_CENTRE_AWARENESS("DataCentreAwareness", null, false, true),
-    SOURCE_AWARENESS("SourceAwareness", null,false, true),
+    PRICE("Cost", null, true),
+    UNMOVEABLE("Unmoveable", null, false);
   
     public String camelName;
     public VariableType variableType;