diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd2ffb8..31b5d48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,4 @@
 cmake_minimum_required(VERSION 3.0.2)
-
-# ========================================================
-# Dual-mode CMakeLists.txt: Supports both Catkin and Standalone CMake
-# ========================================================
-
-# Detect if building with Catkin
-if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
-  set(BUILDING_WITH_CATKIN TRUE)
-  message(STATUS "Building robot_xmlrpcpp with Catkin")
-else()
-  set(BUILDING_WITH_CATKIN FALSE)
-  message(STATUS "Building robot_xmlrpcpp with Standalone CMake")
-endif()
-
 project(robot_xmlrpcpp)
 
 ## Compile as C++17
@@ -25,25 +11,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # Find Packages
 # ========================================================
 
+if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
+  set(BUILDING_WITH_CATKIN TRUE)
+  message(STATUS "Building robot_xmlrpcpp with Catkin")
+else()
+  set(BUILDING_WITH_CATKIN FALSE)
+  message(STATUS "Building robot_xmlrpcpp with Standalone CMake")
+endif()
+
 if(BUILDING_WITH_CATKIN)
   ## Find catkin macros and libraries
   find_package(catkin REQUIRED)
-endif()
-
-## System dependencies are found with CMake's conventions
-find_package(console_bridge REQUIRED)
-
-# ========================================================
-# Catkin specific configuration
-# ========================================================
-
-if(BUILDING_WITH_CATKIN)
-  ## The catkin_package macro generates cmake config files for your package
   catkin_package(
     INCLUDE_DIRS include
     LIBRARIES robot_xmlrpcpp
-    CATKIN_DEPENDS
-    DEPENDS console_bridge
+    # CATKIN_DEPENDS 
   )
 endif()
 
@@ -52,13 +34,12 @@ endif()
 ###########
 
 ## Specify additional locations of header files
-include_directories(
-  include
-  ${console_bridge_INCLUDE_DIRS}
-)
-
 if(BUILDING_WITH_CATKIN)
   include_directories(${catkin_INCLUDE_DIRS})
+else()
+  include_directories(
+    include
+  )
 endif()
 
 ## Declare a C++ library
diff --git a/package.xml b/package.xml
index c1db06f..1de3d64 100644
--- a/package.xml
+++ b/package.xml
@@ -19,8 +19,4 @@
     
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>libconsole-bridge-dev</build_depend>
-
-  <run_depend>libconsole-bridge-dev</run_depend>
-
 </package>
\ No newline at end of file