diff --git a/api/.DS_Store b/api/.DS_Store
deleted file mode 100644
index ee771938787a1bb39cadddab0eb4f7463f2ead2b..0000000000000000000000000000000000000000
Binary files a/api/.DS_Store and /dev/null differ
diff --git a/api/src/main/.DS_Store b/api/src/main/.DS_Store
deleted file mode 100644
index 4e7dab1a407b2356d4931d82b58f1342854c1b44..0000000000000000000000000000000000000000
Binary files a/api/src/main/.DS_Store and /dev/null differ
diff --git a/api/src/main/resources/.DS_Store b/api/src/main/resources/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
Binary files a/api/src/main/resources/.DS_Store and /dev/null differ
diff --git a/api/src/test/.DS_Store b/api/src/test/.DS_Store
deleted file mode 100644
index 269892ea48758c0143331deeb0bb133665cc2eed..0000000000000000000000000000000000000000
Binary files a/api/src/test/.DS_Store and /dev/null differ
diff --git a/api/src/test/resources/.DS_Store b/api/src/test/resources/.DS_Store
deleted file mode 100644
index 6e45758bc159e806b04bd119d08aa5e6a1fc21eb..0000000000000000000000000000000000000000
Binary files a/api/src/test/resources/.DS_Store and /dev/null differ
diff --git a/docker/postgres/.DS_Store b/docker/postgres/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
Binary files a/docker/postgres/.DS_Store and /dev/null differ
diff --git a/research/.DS_Store b/research/.DS_Store
deleted file mode 100644
index ece948c32212594066893e0147aeb881414ea4c9..0000000000000000000000000000000000000000
Binary files a/research/.DS_Store and /dev/null differ
diff --git a/research/experiments/.DS_Store b/research/experiments/.DS_Store
deleted file mode 100644
index e4f02906c8f4e3a0f2f5f96a7f3c78f0d5f58d2a..0000000000000000000000000000000000000000
Binary files a/research/experiments/.DS_Store and /dev/null differ
diff --git a/research/web/.DS_Store b/research/web/.DS_Store
deleted file mode 100644
index 7eba9831a61ba17831eec6e5a0d4a1851e850714..0000000000000000000000000000000000000000
Binary files a/research/web/.DS_Store and /dev/null differ
diff --git a/research/web/maps/.DS_Store b/research/web/maps/.DS_Store
deleted file mode 100644
index 745c55ae93a19a1308132b292a07f98b50f9f8cd..0000000000000000000000000000000000000000
Binary files a/research/web/maps/.DS_Store and /dev/null differ
diff --git a/research/web/metis/.DS_Store b/research/web/metis/.DS_Store
deleted file mode 100644
index 7b9f65015da6dc326fff32be69ebd44ec4a92f51..0000000000000000000000000000000000000000
Binary files a/research/web/metis/.DS_Store and /dev/null differ
diff --git a/restful/src/main/resources/config.properties b/restful/src/main/resources/config.properties
index 40fa7b08214926f4f43fa9cf87d59c888b96ab9d..bc7a3ad3b4ea6dd4da8e705d0b4508b6d5ac431f 100644
--- a/restful/src/main/resources/config.properties
+++ b/restful/src/main/resources/config.properties
@@ -3,9 +3,9 @@ visualization.static.path=/
 # whether to ignore altitude of the map
 flat_map=true 
 # if the simulator should use modelica vehicle
-use_modelica=false
+use_modelica=true
 # which model should the autopilot(RMIModelServer) load
-v_model=AutopilotAdapter
+v_model=AutopilotAdapterModelica
 
 # How often should this server synchronize all sub-simulators. The minimum is 33ms.
 simulation_step_ms=500
diff --git a/restful/src/test/resources/config.properties b/restful/src/test/resources/config.properties
index a5abf617885580fdf1d22a47d3f2478f7ac22223..e16955ed2aa6a29857bafdc8be5de0b3b9671d36 100644
--- a/restful/src/test/resources/config.properties
+++ b/restful/src/test/resources/config.properties
@@ -1,8 +1,8 @@
 visualization.static.path=/
 
 flat_map=true
-use_modelica=false
-v_model=AutopilotAdapter
+use_modelica=true
+v_model=AutopilotAdapterModelica
 weather_rain=0
 simulation_step_ms=500
 windows_dev_mode=false
diff --git a/rpc/.DS_Store b/rpc/.DS_Store
deleted file mode 100644
index 1b5772c9c603e3576c575ead592404aba02ea128..0000000000000000000000000000000000000000
Binary files a/rpc/.DS_Store and /dev/null differ
diff --git a/rpc/lib/Chassis.fmu b/rpc/lib/Chassis.fmu
index 928941a94fce61c8d0c3f6d86ce329f152159c01..f11312360e6e714cfbcfbda9928874cb4cb0f2ff 100644
Binary files a/rpc/lib/Chassis.fmu and b/rpc/lib/Chassis.fmu differ
diff --git a/rpc/lib/InputFilter.fmu b/rpc/lib/InputFilter.fmu
index a78d7690fe94fd699a91ed03c59287e01e377f5c..b487941842b57df9ddebe71032ef7de61de589be 100644
Binary files a/rpc/lib/InputFilter.fmu and b/rpc/lib/InputFilter.fmu differ
diff --git a/rpc/lib/Suspension.fmu b/rpc/lib/Suspension.fmu
index febe77e0389f5e9c97c3596ab2426037b67e1cdb..3daaeaf6f39970081851d99a9130ac269ff57edb 100644
Binary files a/rpc/lib/Suspension.fmu and b/rpc/lib/Suspension.fmu differ
diff --git a/rpc/lib/Tires.fmu b/rpc/lib/Tires.fmu
index c49d14a409a8841415833c203f246228a053570a..b4446c376b17d33c14c2d6842151f31af7252f4f 100644
Binary files a/rpc/lib/Tires.fmu and b/rpc/lib/Tires.fmu differ
diff --git a/rpc/src/test/resources/.DS_Store b/rpc/src/test/resources/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
Binary files a/rpc/src/test/resources/.DS_Store and /dev/null differ