diff --git a/kortex_examples/CMakeLists.txt b/kortex_examples/CMakeLists.txt
index 4f017250..aef72222 100644
--- a/kortex_examples/CMakeLists.txt
+++ b/kortex_examples/CMakeLists.txt
@@ -10,7 +10,6 @@ find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs message_generation
 
 ## Declare a catkin package
 catkin_package()
-catkin_python_setup()
 
 include_directories(include ${catkin_INCLUDE_DIRS})
 include_directories(include ${PROJECT_SOURCE_DIR}/src)
diff --git a/kortex_examples/setup.py b/kortex_examples/setup.py
deleted file mode 100644
index fb59b06b..00000000
--- a/kortex_examples/setup.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from setuptools import setup
-from catkin_pkg.python_setup import generate_distutils_setup
-
-setup(**generate_distutils_setup(
-    packages=['kortex_examples'],
-    package_dir={'': 'src'}
-))
\ No newline at end of file
diff --git a/kortex_gazebo/CMakeLists.txt b/kortex_gazebo/CMakeLists.txt
index 7fe63548..1188dceb 100644
--- a/kortex_gazebo/CMakeLists.txt
+++ b/kortex_gazebo/CMakeLists.txt
@@ -11,12 +11,16 @@ find_package(gazebo)
 
 catkin_package()
 
-find_package(roslaunch)
-
-foreach(dir config launch meshes urdf)
-	install(DIRECTORY ${dir}/
-		DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+# Install
+install(PROGRAMS
+   scripts/home_robot.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(DIRECTORY launch
+DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+FILES_MATCHING PATTERN "*.launch"
+)
 
 # Gazebo is compiled with Protobuf 2.6.1 and Kortex with Protobuf 3.5.1
 # The 2.6.1 includes are prepended to the include_directories so the Gazebo plugins we compile here build