diff --git a/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt b/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt
index a378fe14ab..5899446c2a 100644
--- a/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt
+++ b/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt
@@ -6,10 +6,6 @@ find_package(catkin REQUIRED
   message_generation
   )
 
-if(NOT $ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
-  catkin_python_setup()
-endif()
-
 add_service_files(
   FILES
   ControlBilateral.srv
@@ -23,7 +19,7 @@ install(DIRECTORY config launch script
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS
   )
-if(NOT $ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
+if($ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
   install(DIRECTORY python
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
     USE_SOURCE_PERMISSIONS
diff --git a/jsk_panda_robot/jsk_panda_teleop/setup.py b/jsk_panda_robot/jsk_panda_teleop/setup.py
deleted file mode 100644
index 66f43a495a..0000000000
--- a/jsk_panda_robot/jsk_panda_teleop/setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-from catkin_pkg.python_setup import generate_distutils_setup
-
-d = generate_distutils_setup()
-
-setup(**d)