diff --git a/server/server.py b/server/server.py
index 43f1b3c4..fe079e7e 100644
--- a/server/server.py
+++ b/server/server.py
@@ -15,12 +15,9 @@ def create_argparser():
     parser.add_argument('--tts_config', type=str, help='path to TTS config.json file')
     parser.add_argument('--tts_speakers', type=str, help='path to JSON file containing speaker ids, if speaker ids are used in the model')
     parser.add_argument('--wavernn_lib_path', type=str, default=None, help='path to WaveRNN project folder to be imported. If this is not passed, model uses Griffin-Lim for synthesis.')
-    parser.add_argument('--wavernn_file', type=str, default=None, help='path to WaveRNN checkpoint file.')
+    parser.add_argument('--wavernn_checkpoint', type=str, default=None, help='path to WaveRNN checkpoint file.')
     parser.add_argument('--wavernn_config', type=str, default=None, help='path to WaveRNN config file.')
     parser.add_argument('--is_wavernn_batched', type=convert_boolean, default=False, help='true to use batched WaveRNN.')
-    parser.add_argument('--pwgan_lib_path', type=str, default=None, help='path to ParallelWaveGAN project folder to be imported. If this is not passed, model uses Griffin-Lim for synthesis.')
-    parser.add_argument('--pwgan_file', type=str, default=None, help='path to ParallelWaveGAN checkpoint file.')
-    parser.add_argument('--pwgan_config', type=str, default=None, help='path to ParallelWaveGAN config file.')
     parser.add_argument('--vocoder_config', type=str, default=None, help='path to TTS.vocoder config file.')
     parser.add_argument('--vocoder_checkpoint', type=str, default=None, help='path to TTS.vocoder checkpoint file.')
     parser.add_argument('--port', type=int, default=5002, help='port to listen on.')
@@ -46,10 +43,6 @@ embedded_wavernn_folder = os.path.join(embedded_models_folder, 'wavernn')
 wavernn_checkpoint_file = os.path.join(embedded_wavernn_folder, 'checkpoint.pth.tar')
 wavernn_config_file = os.path.join(embedded_wavernn_folder, 'config.json')
 
-embedded_pwgan_folder = os.path.join(embedded_models_folder, 'pwgan')
-pwgan_checkpoint_file = os.path.join(embedded_pwgan_folder, 'checkpoint.pkl')
-pwgan_config_file = os.path.join(embedded_pwgan_folder, 'config.yml')
-
 args = create_argparser().parse_args()
 
 # If these were not specified in the CLI args, use default values with embedded model files
@@ -57,19 +50,16 @@ if not args.tts_checkpoint and os.path.isfile(tts_checkpoint_file):
     args.tts_checkpoint = tts_checkpoint_file
 if not args.tts_config and os.path.isfile(tts_config_file):
     args.tts_config = tts_config_file
-if not args.vocoder_checkpoint and os.path.isfile(tts_checkpoint_file):
-    args.tts_checkpoint = tts_checkpoint_file
-if not args.vocoder_config and os.path.isfile(tts_config_file):
-    args.tts_config = tts_config_file
 
-if not args.wavernn_file and os.path.isfile(wavernn_checkpoint_file):
-    args.wavernn_file = wavernn_checkpoint_file
+if not args.vocoder_checkpoint and os.path.isfile(vocoder_checkpoint_file):
+    args.vocoder_file = vocoder_checkpoint_file
+if not args.vocoder_config and os.path.isfile(vocoder_config_file):
+    args.vocoder_config = vocoder_config_file
+
+if not args.wavernn_checkpoint and os.path.isfile(wavernn_checkpoint_file):
+    args.wavernn_checkpoint = wavernn_checkpoint_file
 if not args.wavernn_config and os.path.isfile(wavernn_config_file):
     args.wavernn_config = wavernn_config_file
-if not args.pwgan_file and os.path.isfile(pwgan_checkpoint_file):
-    args.pwgan_file = pwgan_checkpoint_file
-if not args.pwgan_config and os.path.isfile(pwgan_config_file):
-    args.pwgan_config = pwgan_config_file
 
 synthesizer = Synthesizer(args)
 
diff --git a/server/synthesizer.py b/server/synthesizer.py
index b18d73ac..99819ccc 100644
--- a/server/synthesizer.py
+++ b/server/synthesizer.py
@@ -31,15 +31,16 @@ class Synthesizer(object):
         self.wavernn = None
         self.vocoder_model = None
         self.config = config
+        print(config)
         self.use_cuda = self.config.use_cuda
         if self.use_cuda:
             assert torch.cuda.is_available(), "CUDA is not availabe on this machine."
         self.load_tts(self.config.tts_checkpoint, self.config.tts_config,
                       self.config.use_cuda)
-        if self.config.vocoder_file:
+        if self.config.vocoder_checkpoint:
             self.load_vocoder(self.config.vocoder_checkpoint, self.config.vocoder_config, self.config.use_cuda)
         if self.config.wavernn_lib_path:
-            self.load_wavernn(self.config.wavernn_lib_path, self.config.wavernn_file,
+            self.load_wavernn(self.config.wavernn_lib_path, self.config.wavernn_checkpoint,
                               self.config.wavernn_config, self.config.use_cuda)
 
     def load_tts(self, tts_checkpoint, tts_config, use_cuda):