diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62b056a..dc986dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,10 @@
-#
-# Personal Robotics Laboratory
-# Catkin/Rosbuild Switching Template
-#
-# This CMakeLists.txt file is designed to correctly switch two CMakeLists,
-# one for rosbuild and one for catkin.
-#
-# To use this file, create two CMakeLists:
-#   - catkin.cmake : the CMakeLists used in ROS catkin builds
-#   - rosbuild.cmake : the CMakeLists used for ROS rosbuild builds
-#
 cmake_minimum_required(VERSION 2.8.3)
 project(prpy)
- 
-if (DEFINED CATKIN_TOPLEVEL OR (NOT ("$ENV{ROS_DISTRO}" STREQUAL "fuerte")))
-    include(${PROJECT_SOURCE_DIR}/catkin.cmake)
-else ()
-    include(${PROJECT_SOURCE_DIR}/rosbuild.cmake)
-endif ()
+
+find_package(catkin REQUIRED)
+catkin_package()
+catkin_python_setup()
+
+if (CATKIN_ENABLE_TESTING)
+  catkin_add_nosetests(tests)
+endif()
diff --git a/catkin.cmake b/catkin.cmake
deleted file mode 100644
index 6361ed7..0000000
--- a/catkin.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.8.3)
-
-find_package(catkin REQUIRED)
-catkin_package()
-catkin_python_setup()
-
-if (CATKIN_ENABLE_TESTING)
-    catkin_add_nosetests(tests)
-endif()
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index e88d720..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<package>
-    <description brief="Python utilities used by the Personal Robotics Laboratory.">
-        prpy is a Python library used by the Personal Robotics Laboratory at
-        Carnegie Mellon University. This library includes robot-agnostic
-        utilities that make it easier to use OpenRAVE in Python scripts. This
-        includes a high-level planning pipeline, helper functions, and
-        visualization tools.
-    </description>
-    <author>Michael Koval</author>
-    <license>BSD</license>
-    <review status="released" notes="approved on 3/13"/>
-    <depend package="openrave"/>
-    <depend package="manipulation2"/>
-    <rosdep name="python-scipy"/>
-    <export>
-        <openrave optional="cbirrt2"/>
-        <openrave optional="orcdchomp"/>
-        <openrave optional="or_ompl"/>
-        <openrave optional="or_sbpl"/>
-    </export>
-</package>
diff --git a/rosbuild.cmake b/rosbuild.cmake
deleted file mode 100644
index f8f1c9c..0000000
--- a/rosbuild.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-
-# Set the build type.  Options are:
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
-
-rosbuild_init()
-
-#set the default path for built executables to the "bin" directory
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
-
-#common commands for building c++ executables and libraries
-#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-#rosbuild_add_boost_directories()
-#rosbuild_link_boost(${PROJECT_NAME} thread)
-#rosbuild_add_executable(example examples/example.cpp)
-#target_link_libraries(example ${PROJECT_NAME})