diff --git a/Dockerfile b/Dockerfile
index e357ae61..3ebb0b1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -129,5 +129,5 @@ RUN rm -rf \
   /code/SuperBuild/src/pdal
 
 # Entry point
-ENTRYPOINT ["python", "/code/run.py", "code"]
+ENTRYPOINT ["python", "/code/run.py"]
 
diff --git a/opendm/config.py b/opendm/config.py
index 39f878b6..1b1af51a 100644
--- a/opendm/config.py
+++ b/opendm/config.py
@@ -59,6 +59,8 @@ def config():
     parser.add_argument('name',
                         metavar='<project name>',
                         type=alphanumeric_string,
+                        default='code',
+                        nargs='?',
                         help='Name of Project (i.e subdirectory of projects folder)')
 
     parser.add_argument('--resize-to',
diff --git a/opendm/osfm.py b/opendm/osfm.py
index 236fc8da..0f873fc7 100644
--- a/opendm/osfm.py
+++ b/opendm/osfm.py
@@ -124,6 +124,7 @@ class OSFMContext:
 
             if gcp_path:
                 config.append("bundle_use_gcp: yes")
+                config.append("bundle_use_gps: no")
                 io.copy(gcp_path, self.path("gcp_list.txt"))
             
             config = config + append_config
diff --git a/portable.Dockerfile b/portable.Dockerfile
index d8189f21..0ec771e8 100644
--- a/portable.Dockerfile
+++ b/portable.Dockerfile
@@ -136,5 +136,5 @@ RUN rm -rf \
   /code/SuperBuild/src/pdal
 
 # Entry point
-ENTRYPOINT ["python", "/code/run.py", "code"]
+ENTRYPOINT ["python", "/code/run.py"]
 
diff --git a/stages/odm_georeferencing.py b/stages/odm_georeferencing.py
index 3ae36a92..f846e161 100644
--- a/stages/odm_georeferencing.py
+++ b/stages/odm_georeferencing.py
@@ -80,20 +80,7 @@ class ODMGeoreferencingStage(types.ODM_Stage):
                 else:
                     kwargs['pc_params'] = ''
  
-                # Check to see if the GCP file exists
-
-                if not self.params.get('use_exif') and (self.params.get('gcp_file') or tree.odm_georeferencing_gcp):
-                   log.ODM_INFO('Found %s' % gcpfile)
-                   try:
-                       system.run('{bin}/odm_georef -bundleFile {bundle} -imagesPath {imgs} -imagesListPath {imgs_list} '
-                                  '-inputFile {model} -outputFile {model_geo} '
-                                  '{pc_params} {verbose} '
-                                  '-logFile {log} -outputTransformFile {transform_file} -georefFileOutputPath {geo_sys} -gcpFile {gcp} '
-                                  '-outputCoordFile {coords}'.format(**kwargs))
-                   except Exception:
-                       log.ODM_EXCEPTION('Georeferencing failed. ')
-                       exit(1)
-                elif io.file_exists(tree.opensfm_transformation) and io.file_exists(tree.odm_georeferencing_coords):
+                if io.file_exists(tree.opensfm_transformation) and io.file_exists(tree.odm_georeferencing_coords):
                     log.ODM_INFO('Running georeferencing with OpenSfM transformation matrix')
                     system.run('{bin}/odm_georef -bundleFile {bundle} -inputTransformFile {input_trans_file} -inputCoordFile {coords} '
                                '-inputFile {model} -outputFile {model_geo} '