diff --git a/paddle/scripts/submit_local.sh.in b/paddle/scripts/submit_local.sh.in
index 622a2d51049d164b6e8423e4054081f40f190cb9..1f421f248fa9f843a260e53fcd4d4ed7713545f1 100755
--- a/paddle/scripts/submit_local.sh.in
+++ b/paddle/scripts/submit_local.sh.in
@@ -1,19 +1,5 @@
 #!/bin/bash
 
-function usage(){
-        echo "usage: paddle [--help] [<args>]"
-        echo "These are common paddle commands used in various situations:"
-        echo "    train             Start a paddle_trainer"
-        echo "    merge_model       Start a paddle_merge_model"
-        echo "    pserver           Start a paddle_pserver_main"
-        echo "    version           Print paddle version"
-        echo "    dump_config       Dump the trainer config as proto string"
-        echo "    make_diagram      Make Diagram using Graphviz"
-        echo ""
-        echo "'paddle train --help' 'paddle merge_model --help', 'paddle pserver --help', list more detailed usage of each command"
-}
-
-
 function version(){
         echo "PaddlePaddle @PADDLE_VERSION@, compiled with"
         echo "    with_avx: @WITH_AVX@"
@@ -177,30 +163,10 @@ cpu_config
 # echo $KMP_AFFINITY $OMP_DYNAMIC
 
 case "$1" in
-    "train")
-        threads_config $@
-        # echo $OMP_NUM_THREADS $MKL_NUM_THREADS $OPENBLAS_NUM_THREADS
-        ${DEBUGGER} $PADDLE_BIN_PATH/paddle_trainer ${@:2}
-        ;;
-    "merge_model")
-        ${DEBUGGER} $PADDLE_BIN_PATH/paddle_merge_model ${@:2}
-        ;;
-    "pserver")
-        ${DEBUGGER} $PADDLE_BIN_PATH/paddle_pserver_main ${@:2}
-        ;;
-    "dump_config")
-        python -m paddle.utils.dump_config ${@:2}
-        ;;
-    "make_diagram")
-        python -m paddle.utils.make_model_diagram ${@:2}
-        ;;
     "version")
         version
         ;;
-    "--help")
-        usage
-        ;;
     *)
-        usage
+        version
         ;;
  esac
diff --git a/python/setup.py.in b/python/setup.py.in
index 730b2e1f71c27c84c8b65a2060c4785d3ff1d831..e00c88b3a6e49bd806bcc6125fa8dc0f69928227 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -125,6 +125,8 @@ if '${CMAKE_SYSTEM_PROCESSOR}' not in ['arm', 'armv7-a', 'aarch64']:
 
 # the prefix is sys.prefix which should always be usr
 paddle_bins = ''
+if not '${WIN32}':
+    paddle_bins = ['${PADDLE_BINARY_DIR}/paddle/scripts/paddle']
 package_data={'paddle.fluid': ['core' + (ext_name if os.name != 'nt' else '.pyd')]}
 
 package_dir={