diff --git a/deepspeech/exps/deepspeech2/model.py b/deepspeech/exps/deepspeech2/model.py
index 91b7a1bfe..fab94ced8 100644
--- a/deepspeech/exps/deepspeech2/model.py
+++ b/deepspeech/exps/deepspeech2/model.py
@@ -331,12 +331,8 @@ class DeepSpeech2Tester(DeepSpeech2Trainer):
             exit(-1)
 
     def export(self):
-        if self.config.model.apply_online == False:
-            infer_model = DeepSpeech2InferModel.from_pretrained(
-                self.test_loader, self.config, self.args.checkpoint_path)
-        else:
-            infer_model = DeepSpeech2InferModelOnline.from_pretrained(
-                self.test_loader, self.config, self.args.checkpoint_path)
+        infer_model = DeepSpeech2InferModel.from_pretrained(
+             self.test_loader, self.config, self.args.checkpoint_path)
 
         infer_model.eval()
         feat_dim = self.test_loader.collate_fn.feature_size
diff --git a/deepspeech/models/ds2/__init__.py b/deepspeech/models/ds2/__init__.py
new file mode 100644
index 000000000..de78ebe91
--- /dev/null
+++ b/deepspeech/models/ds2/__init__.py
@@ -0,0 +1,4 @@
+from .deepspeech2 import DeepSpeech2Model
+from .deepspeech2 import DeepSpeech2InferModel
+
+__all__ = ['DeepSpeech2Model', 'DeepSpeech2InferModel']
diff --git a/examples/aishell/s0/run.sh b/examples/aishell/s0/run.sh
index 33b02f7ce..c9708dcc9 100755
--- a/examples/aishell/s0/run.sh
+++ b/examples/aishell/s0/run.sh
@@ -2,7 +2,7 @@
 set -e
 source path.sh
 
-gpus=2,3,4,5
+gpus=0,1,2,3
 stage=0
 stop_stage=100
 conf_path=conf/deepspeech2.yaml