diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp
index 70db1d98b..2955bc215 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp
@@ -117,7 +117,7 @@ void UCarlaBlueprintRegistry::AddToCarlaBlueprintRegistry(const TArray<FPropPara
 
 }
 
-void UCarlaBlueprintRegistry::LoadPropDefinitions(TArray<FActorDefinition> &Definitions)
+void UCarlaBlueprintRegistry::LoadPropDefinitions(TArray<FPropParameters> &PropParametersArray)
 {
   // Loads prop registry json files
   const FString WildCard = FString("*").Append(PropAttributes::REGISTRY_FORMAT);
@@ -148,7 +148,6 @@ void UCarlaBlueprintRegistry::LoadPropDefinitions(TArray<FActorDefinition> &Defi
 
   // Read all registry files and overwrite default registry values with user
   // registry files
-  TArray<FPropParameters> PropParametersArray;
   TMap<FString, int> PropIndexes;
 
   for (auto i = 0u; i < PropFileNames.Num(); ++i)
@@ -190,6 +189,4 @@ void UCarlaBlueprintRegistry::LoadPropDefinitions(TArray<FActorDefinition> &Defi
       }
     }
   }
-
-  UActorBlueprintFunctionLibrary::MakePropDefinitions(PropParametersArray, Definitions);
 }
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h
index 404337613..56ee8f778 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h
@@ -24,9 +24,9 @@ private:
 public:
 
   UFUNCTION(Category = "Carla Blueprint Registry", BlueprintCallable)
-  void AddToCarlaBlueprintRegistry(const TArray<FPropParameters> &PropParametersArray);
+  static void AddToCarlaBlueprintRegistry(const TArray<FPropParameters> &PropParametersArray);
 
   UFUNCTION(Category = "Carla Blueprint Registry", BlueprintCallable)
-  void LoadPropDefinitions(TArray<FActorDefinition> &Definitions);
+  static void LoadPropDefinitions(TArray<FPropParameters> &PropParametersArray);
 
 };
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp
index 04fa30ae5..27151576e 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp
@@ -11,6 +11,7 @@ TArray<FString> UCarlaStatics::GetAllMapNames()
 {
   TArray<FString> TmpStrList, MapNameList;
   IFileManager::Get().FindFilesRecursive(MapNameList, *FPaths::ProjectContentDir(), TEXT("*.umap"), true, false, false);
+  MapNameList.RemoveAll( [](const FString &Name) { return Name.Contains("TestMaps");});
   for (int i = 0; i < MapNameList.Num(); i++) {
       MapNameList[i].ParseIntoArray(TmpStrList, TEXT("Content/"), true);
       MapNameList[i] = TmpStrList[1];
diff --git a/Util/BuildTools/ExportFBX.sh b/Util/BuildTools/ExportFBX.sh
index 7ea377138..dc407022c 100755
--- a/Util/BuildTools/ExportFBX.sh
+++ b/Util/BuildTools/ExportFBX.sh
@@ -96,11 +96,11 @@ log "Packaging build."
 #rm -Rf ./Engine
 rm -Rf ./CarlaUE4/Metadata
 rm -Rf ./CarlaUE4/Plugins
-#@TODO: Instead of this hardcoded path, we need to pick the ${MAPS_TO_COOK} path
-#rm -Rf ./CarlaUE4/${MAPS_TO_COOK_But_instead_of_"game"_the_folder_is_content}.uexp
-#rm -Rf ./CarlaUE4/${MAPS_TO_COOK_But_instead_of_"game"_the_folder_is_content}.umap
-#rm -Rf ./CarlaUE4/Content/Carla/Maps/BaseMap/TEMPMAP.uexp
-#rm -Rf ./CarlaUE4/Content/Carla/Maps/BaseMap/TEMPMAP.umap
+
+# Remove TEMPMAP.umap and TEMPMAP.uexp
+TEMPMAP_BASE_PATH="$CARLAUE4_ROOT_FOLDER${MAP_TO_COOK/Game/"Content"}"
+rm -f $TEMPMAP_BASE_PATH.uexp
+rm $TEMPMAP_BASE_PATH.umap
 
 rm ./CarlaUE4/AssetRegistry.bin
 
diff --git a/Util/import_fbx.py b/Util/import_fbx.py
index e73646352..3789a7d9d 100755
--- a/Util/import_fbx.py
+++ b/Util/import_fbx.py
@@ -50,11 +50,11 @@ def import_all_fbx_in_folder(fbx_folder, folder_list):
         final_list = final_list[:-1]
         print(final_list)
         #Destination map (the one that will be cooked)
-        dest_map_path = "/Game/Carla/Maps/BaseMap"
+        dest_map_path = "/Game/Carla/Maps/TestMaps"
         dest_map_name = "TEMPMAP"
         # This should be a folder, because the commandlet will take anything inside.
         # It is better if there is only one map inside
-        src_map_folder = "/Game/Carla/Maps/EmptyMap"
+        src_map_folder = "/Game/Carla/Maps/TestMaps"
         prepare_cook_commandlet(final_list, src_map_folder, dest_map_path, dest_map_name)
         launch_bash_script("BuildTools/ExportFBX.sh", "--maps=%s/%s" % (dest_map_path, dest_map_name))