diff --git a/cmake_targets/tools/MODULES/FindFreeDiameter.cmake b/cmake_targets/tools/MODULES/FindFreeDiameter.cmake
deleted file mode 100755
index 62517c0528..0000000000
--- a/cmake_targets/tools/MODULES/FindFreeDiameter.cmake
+++ /dev/null
@@ -1,89 +0,0 @@
-# - Find freediameter
-# Find the native FreeDiameter includes and libraries
-#
-#  FREEDIAMETER_FOUND - True if FreeDiameter found.
-#  FREEDIAMETER_INCLUDE_DIR - where to find gnutls.h, etc.
-#  FREEDIAMETER_LIBRARIES - List of libraries when using gnutls.
-#  FREEDIAMETER_HSS_S6A_ENABLED - true if FreeDiameter enabled for S6A interface 
-
-
-if (FREEDIAMETER_INCLUDE_DIR AND FREEDIAMETER_LIBRARIES)
-  set(FREEDIAMETER_FIND_QUIETLY TRUE)
-endif (FREEDIAMETER_INCLUDE_DIR AND FREEDIAMETER_LIBRARIES)
-
-# Include dir
-find_path(FREEDIAMETER_INCLUDE_DIR
-    NAMES
-    freeDiameter/freeDiameter-host.h
-    freeDiameter/libfdcore.h
-    freeDiameter/libfdproto.h
-)
-
-# Library
-find_library(FREEDIAMETER_LIBRARY 
-  NAMES fdcore
-)
-
-# handle the QUIETLY and REQUIRED arguments and set FREEDIAMETER_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEDIAMETER DEFAULT_MSG FREEDIAMETER_LIBRARY FREEDIAMETER_INCLUDE_DIR)
-
-IF(FREEDIAMETER_FOUND)
-  SET( FREEDIAMETER_LIBRARIES ${FREEDIAMETER_LIBRARY} )
-ELSE(FREEDIAMETER_FOUND)
-  SET( FREEDIAMETER_LIBRARIES )
-ENDIF(FREEDIAMETER_FOUND)
-
-find_library(FREEDIAMETER_LIBRARY2 
-  NAMES fdproto
-)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEDIAMETER2 DEFAULT_MSG FREEDIAMETER_LIBRARY2 FREEDIAMETER_INCLUDE_DIR)
-IF(FREEDIAMETER2_FOUND)
-  SET( FREEDIAMETER_LIBRARIES ${FREEDIAMETER_LIBRARIES} ${FREEDIAMETER_LIBRARY2} )
-ELSE(FREEDIAMETER2_FOUND)
-  SET( FREEDIAMETER_LIBRARIES )
-ENDIF(FREEDIAMETER2_FOUND)
-
-
-# Lastly make it so that the FREEDIAMETER_LIBRARY and FREEDIAMETER_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( FREEDIAMETER_LIBRARY FREEDIAMETER_INCLUDE_DIR )
-
-# Now check if the library is patched for OPENAIR HSS S6A.
-IF(FREEDIAMETER_FOUND)
-  IF( FREEDIAMETER_INCLUDE_DIR )
-    # Extract FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR from freeDiameter-host.h
-    # Read the whole file:
-    #
-    FILE(READ "${FREEDIAMETER_INCLUDE_DIR}/freeDiameter/freeDiameter-host.h" _freeDiameter_HOST_H_CONTENTS)
-
-    STRING(REGEX REPLACE ".*#define FD_PROJECT_VERSION_MAJOR ([0-9]+).*" "\\1" FD_PROJECT_VERSION_MAJOR "${_freeDiameter_HOST_H_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define FD_PROJECT_VERSION_MINOR ([0-9]+).*" "\\1" FD_PROJECT_VERSION_MINOR "${_freeDiameter_HOST_H_CONTENTS}")
-
-    IF(FD_PROJECT_VERSION_MAJOR GREATER 0)
-      MATH(EXPR FREEDIAMETER_VERSION_VALUE "${FD_PROJECT_VERSION_MAJOR} * 100 + ${FD_PROJECT_VERSION_MINOR} * 10")
-      SET(FREEDIAMETER_VERSION "${FREEDIAMETER_VERSION_VALUE}" CACHE INTERNAL "Freediameter release version")
-      MESSAGE(STATUS "freeDiameter version found ${FREEDIAMETER_VERSION}")
-    ENDIF(FD_PROJECT_VERSION_MAJOR GREATER 0)
-  ENDIF( FREEDIAMETER_INCLUDE_DIR )
-  GET_FILENAME_COMPONENT(FREEDIAMETER_PATH ${FREEDIAMETER_LIBRARY} PATH)
-  IF( NOT( "${FREEDIAMETER_VERSION_TEST_FOR}" STREQUAL "${FREEDIAMETER_LIBRARIES}" ))
-    INCLUDE (CheckLibraryExists) 
-    MESSAGE(STATUS "Checking freeDiameter patched for S6A")
-    UNSET(FREEDIAMETER_HSS_S6A_ENABLED)
-    UNSET(FREEDIAMETER_HSS_S6A_ENABLED CACHE)
-    UNSET(DICT_S6A_FOUND)
-    UNSET(DICT_S6A_FOUND CACHE)
-
-
-    FIND_FILE(DICT_S6A_FOUND NAMES dict_s6a.fdx PATHS ${FREEDIAMETER_PATH} ${FREEDIAMETER_PATH}/freeDiameter)
-    IF(DICT_S6A_FOUND)
-        SET( FREEDIAMETER_HSS_S6A_ENABLED TRUE CACHE INTERNAL "dict_s6a.fdx Found")
-    ELSE(DICT_S6A_FOUND)
-        SET( FREEDIAMETER_HSS_S6A_ENABLED FALSE CACHE INTERNAL "dict_s6a.fdx not Found")
-    ENDIF(DICT_S6A_FOUND)
-    SET( FREEDIAMETER_VERSION_TEST_FOR ${FREEDIAMETER_LIBRARIES} CACHE INTERNAL "Version the test was made against" )
-  ENDIF (NOT( "${FREEDIAMETER_VERSION_TEST_FOR}" STREQUAL "${FREEDIAMETER_LIBRARIES}" ))
-ENDIF(FREEDIAMETER_FOUND)
-
diff --git a/cmake_targets/tools/MODULES/FindMySQL.cmake b/cmake_targets/tools/MODULES/FindMySQL.cmake
deleted file mode 100755
index 668f8a434d..0000000000
--- a/cmake_targets/tools/MODULES/FindMySQL.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-# - Find mysqlclient
-#
-# -*- cmake -*-
-#
-# Find the native MySQL includes and library
-#
-#  MySQL_INCLUDE_DIR - where to find mysql.h, etc.
-#  MySQL_LIBRARIES   - List of libraries when using MySQL.
-#  MySQL_FOUND       - True if MySQL found.
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  # Already in cache, be silent
-  SET(MySQL_FIND_QUIETLY TRUE)
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-
-# Include dir
-FIND_PATH(MySQL_INCLUDE_DIR 
-  NAMES mysql.h
-  PATH_SUFFIXES mysql
-)
-
-# Library
-#SET(MySQL_NAMES mysqlclient mysqlclient_r)
-SET(MySQL_NAMES mysqlclient)
-FIND_LIBRARY(MySQL_LIBRARY
-  NAMES ${MySQL_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  PATH_SUFFIXES mysql
-)
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  SET(MySQL_FOUND TRUE)
-  SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
-ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  SET(MySQL_FOUND FALSE)
-  SET( MySQL_LIBRARIES )
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-
-
-IF (MySQL_FOUND)
-  IF (NOT MySQL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found MySQL: ${MySQL_LIBRARY}")
-  ENDIF (NOT MySQL_FIND_QUIETLY)
-ELSE (MySQL_FOUND)
-  IF (MySQL_FIND_REQUIRED)
-    MESSAGE(STATUS "Looked for MySQL libraries named ${MySQL_NAMES}.")
-    MESSAGE(FATAL_ERROR "Could NOT find MySQL library")
-  ENDIF (MySQL_FIND_REQUIRED)
-ENDIF (MySQL_FOUND)
-
-MARK_AS_ADVANCED(
-  MySQL_LIBRARY
-  MySQL_INCLUDE_DIR
-  )
-
diff --git a/cmake_targets/tools/MODULES/FindPostgreSQL.cmake b/cmake_targets/tools/MODULES/FindPostgreSQL.cmake
deleted file mode 100755
index a639a262b0..0000000000
--- a/cmake_targets/tools/MODULES/FindPostgreSQL.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# - Find PostgreSQL library
-#
-# This module defines:
-#  POSTGRESQL_FOUND - True if the package is found
-#  POSTGRESQL_INCLUDE_DIR - containing libpq-fe.h
-#  POSTGRESQL_LIBRARIES - Libraries to link to use PQ functions.
-
-if (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
-  set(POSTGRESQL_FIND_QUIETLY TRUE)
-endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
-
-# Include dir
-find_path(POSTGRESQL_INCLUDE_DIR 
-	NAMES libpq-fe.h
-	PATH_SUFFIXES pgsql postgresql
-)
-
-# Library
-find_library(POSTGRESQL_LIBRARY 
-  NAMES pq
-)
-
-# handle the QUIETLY and REQUIRED arguments and set POSTGRESQL_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(POSTGRESQL DEFAULT_MSG POSTGRESQL_LIBRARY POSTGRESQL_INCLUDE_DIR)
-
-IF(POSTGRESQL_FOUND)
-  SET( POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY} )
-ELSE(POSTGRESQL_FOUND)
-  SET( POSTGRESQL_LIBRARIES )
-ENDIF(POSTGRESQL_FOUND)
-
-# Lastly make it so that the POSTGRESQL_LIBRARY and POSTGRESQL_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( POSTGRESQL_LIBRARY POSTGRESQL_INCLUDE_DIR )
diff --git a/cmake_targets/tools/MODULES/path_prefixes.cmake b/cmake_targets/tools/MODULES/path_prefixes.cmake
deleted file mode 100755
index 7deaec0fed..0000000000
--- a/cmake_targets/tools/MODULES/path_prefixes.cmake
+++ /dev/null
@@ -1,264 +0,0 @@
-# Declare variables for path prefixes for different types of files.
-# NB: depends on 'multi_kernel' and 'uninstall_target'.
-
-# fill_install_prefixes(<project_name> <project_prefix>
-#     [BASE_INSTALL_PREFIX <base_install_prefix>]
-#     [KERNEL]
-# )
-#
-# Setup variables <project_prefix>_* to the install prefixes for
-# different project components.
-# Precisely, variables with next sufficies are set:
-#  INSTALL_PREFIX_EXEC - executables
-#  INSTALL_PREFIX_READONLY - readonly files
-#  INSTALL_PREFIX_GLOBAL_CONF - global configuration files
-#  INSTALL_PREFIX_PREFIX_LIB - libraries
-#  INSTALL_INCLUDE_DIR - include directory(for flags to compiler)
-#  INSTALL_PREFIX_INCLUDE - include files
-#  INSTALL_PREFIX_TEMP_SESSION - temporary files(exists until system restarts)
-#  INSTALL_PREFIX_TEMP - temporary files(preserved even when system restats)
-#  INSTALL_PREFIX_STATE - files which describe current state of the project.
-#  INSTALL_PREFIX_CACHE - cache files
-#  INSTALL_PREFIX_VAR - other modifiable files
-#  INSTALL_PREFIX_DOC - documentation files
-#  INSTALL_PREFIX_EXAMPLES - documentation files
-#
-# With 'KERNEL' option enabled paths for kernel-related files also set:
-#  INSTALL_KINCLUDE_DIR - directory for include when build kernel components
-#  INSTALL_PREFIX_KINCLUDE - include files for the kernel.
-#
-# Additionally, with 'KERNEL' option enabled, several variables are set to
-# paths, which contains "%kernel%" pattern.
-# These paths are intended for kernel-dependent files; for make paths
-# complete one should replace "%kernel%" substring with version of the
-# kernel.
-# Next kernel-dependend paths are set(sufficies only):
-#  KERNEL_INSTALL_PREFIX_KMODULE - directory for install kernel modules
-#  KERNEL_INSTALL_PREFIX_KSYMVERS - directory for install kernel modules' symvers files.
-#  KERNEL_INSTALL_INCLUDE_KERNEL_DIR - include directory with kernel-dependent headers.
-#  KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL - include files, which depends from kernel.
-#
-# Iff option 'COMMON_INSTALL_PREFIX' is given, all paths above are
-# calculated using <base_install_prefix> as base prefix.
-# Otherwise, CMAKE_INSTALL_PREFIX is used for that purpose.
-#
-# Additionally,
-#  INSTALL_TYPE
-# variable(suffix) is set to one of:
-#  - "GLOBAL_OPT" - install into "/opt",
-#  - "GLOBAL" - global installation except one into "/opt",
-#  - "LOCAL" - local installation.
-function(fill_install_prefixes project_name project_prefix)
-    cmake_parse_arguments(fip "KERNEL" "BASE_INSTALL_PREFIX" "" ${ARGN})
-    if(fip_UNPARSED_ARGUMENTS)
-    list(GET fip_UNPARSED_ARGUMENTS 0 exceeded_arg)
-    message(SEND_ERROR "Exceeded argument: ${exceeded_arg}")
-    endif(fip_UNPARSED_ARGUMENTS)
-    if(NOT fip_BASE_INSTALL_PREFIX)
-    set(fip_BASE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-    endif(NOT fip_BASE_INSTALL_PREFIX)
-
-    # Follow conventions about paths listed in
-    #   devel-docs/general/path_conventions.txt
-    # in kedr-devel package.
-
-    # Determine type of installation
-    if(fip_BASE_INSTALL_PREFIX MATCHES "^/opt")
-	set(fip_INSTALL_TYPE "GLOBAL_OPT")
-    elseif(fip_BASE_INSTALL_PREFIX MATCHES "^/usr"
-	OR fip_BASE_INSTALL_PREFIX STREQUAL "/"
-    )
-	set(fip_INSTALL_TYPE "GLOBAL")
-    else()
-	set(fip_INSTALL_TYPE "LOCAL")
-    endif()
-
-    # 1
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_EXEC "/opt/${project_name}/bin")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_EXEC "${fip_BASE_INSTALL_PREFIX}/bin")
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 2
-    set(fip_INSTALL_PREFIX_EXEC_AUX
-	"${fip_BASE_INSTALL_PREFIX}/lib/${project_name}"
-    )
-    # 3
-    set(fip_INSTALL_PREFIX_READONLY
-        "${fip_BASE_INSTALL_PREFIX}/share/${project_name}"
-    )
-    # 4
-    set(fip_INSTALL_PREFIX_MANPAGE
-        "${fip_BASE_INSTALL_PREFIX}/share/man"
-    )
-    # 5
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF "/etc/opt/${project_name}")
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF "/etc/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF
-	    "${fip_BASE_INSTALL_PREFIX}/etc/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 6
-    set(fip_INSTALL_PREFIX_LIB "${fip_BASE_INSTALL_PREFIX}/lib")
-    # 7
-    set(fip_INSTALL_PREFIX_LIB_AUX
-        "${fip_BASE_INSTALL_PREFIX}/lib/${project_name}"
-    )
-    # 8
-    set(fip_INSTALL_INCLUDE_DIR "${fip_BASE_INSTALL_PREFIX}/include")
-
-    set(fip_INSTALL_PREFIX_INCLUDE
-        "${fip_INSTALL_INCLUDE_DIR}/${project_name}"
-    )
-    # 9
-    set(fip_INSTALL_PREFIX_TEMP_SESSION "/tmp/${project_name}")
-    # 10
-    if(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_TEMP "/var/tmp/${project_name}")
-    else(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_TEMP
-            "${fip_BASE_INSTALL_PREFIX}/var/tmp/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE MATCHES "GLOBAL")
-    # 11
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-        set(fip_INSTALL_PREFIX_STATE
-	    "/var/opt/${project_name}/lib/${project_name}"
-	)
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-        set(fip_INSTALL_PREFIX_STATE "/var/lib/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_STATE
-	    "${fip_BASE_INSTALL_PREFIX}/var/lib/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 12
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-        set(fip_INSTALL_PREFIX_CACHE
-	    "/var/opt/${project_name}/cache/${project_name}"
-	)
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_CACHE "/var/cache/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_CACHE
-	    "${fip_BASE_INSTALL_PREFIX}/var/cache/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 13
-    if(fip_INSTALL_TYPE MATCHES "GLOBAL")
-        set(fip_INSTALL_PREFIX_VAR "/var/opt/${project_name}")
-    else(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_VAR
-	    "${fip_BASE_INSTALL_PREFIX}/var/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE MATCHES "GLOBAL")
-    # 14
-    set(fip_INSTALL_PREFIX_DOC
-	"${fip_BASE_INSTALL_PREFIX}/share/doc/${project_name}"
-    )
-
-    # Set derivative install path and prefixes
-
-    # additional, 4
-    set(fip_INSTALL_PREFIX_EXAMPLES
-    "${fip_INSTALL_PREFIX_READONLY}/examples")
-
-    # Export symbols to the outer scope
-    foreach(suffix
-	INSTALL_TYPE
-	INSTALL_PREFIX_EXEC
-	INSTALL_PREFIX_EXEC_AUX
-	INSTALL_PREFIX_READONLY
-	INSTALL_PREFIX_MANPAGE
-	INSTALL_PREFIX_GLOBAL_CONF
-	INSTALL_PREFIX_LIB
-	INSTALL_PREFIX_LIB_AUX
-	INSTALL_INCLUDE_DIR
-	INSTALL_PREFIX_INCLUDE
-	INSTALL_PREFIX_TEMP_SESSION
-	INSTALL_PREFIX_TEMP
-	INSTALL_PREFIX_STATE
-	INSTALL_PREFIX_CACHE
-	INSTALL_PREFIX_VAR
-	INSTALL_PREFIX_DOC
-	INSTALL_PREFIX_EXAMPLES
-    )
-	set(${project_prefix}_${suffix} "${fip_${suffix}}" PARENT_SCOPE)
-    endforeach(suffix)
-    
-    if(fip_KERNEL)
-	# Set derivative install path and prefixes
-	# additional, 1
-	if(fip_INSTALL_TYPE MATCHES GLOBAL)
-	    set(fip_KERNEL_INSTALL_PREFIX_KMODULE
-		"/lib/modules/%kernel%/extra"
-	    )
-	else(fip_INSTALL_TYPE MATCHES GLOBAL)
-	    set(fip_KERNEL_INSTALL_PREFIX_KMODULE
-		"${fip_INSTALL_PREFIX_LIB}/modules/%kernel%/extra"
-	    )
-	endif(fip_INSTALL_TYPE MATCHES GLOBAL)
-
-	# additional, 2
-	set(fip_KERNEL_INSTALL_PREFIX_KSYMVERS
-	    "${fip_INSTALL_PREFIX_LIB}/modules/%kernel%/symvers"
-	)
-	# additional, 3
-	set(fip_INSTALL_KINCLUDE_DIR "${fip_INSTALL_INCLUDE_DIR}")
-	set(fip_INSTALL_PREFIX_KINCLUDE "${fip_INSTALL_PREFIX_INCLUDE}")
-
-	# Kernel include files, which depends from kernel version.
-	# This prefix is not listed in path conventions.
-	set(fip_KERNEL_INSTALL_INCLUDE_KERNEL_DIR
-	    "${fip_BASE_INSTALL_PREFIX}/include-kernel/%kernel%"
-	)
-
-	set(fip_KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL
-	    "${fip_KERNEL_INSTALL_INCLUDE_KERNEL_DIR}/${project_name}-kernel"
-	)
-
-	# Export symbols to the outer scope
-	foreach(suffix
-	    KERNEL_INSTALL_PREFIX_KMODULE
-	    KERNEL_INSTALL_PREFIX_KSYMVERS
-	    INSTALL_KINCLUDE_DIR
-	    INSTALL_PREFIX_KINCLUDE
-	    KERNEL_INSTALL_INCLUDE_KERNEL_DIR
-	    KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL
-	)
-	    set(${project_prefix}_${suffix} "${fip_${suffix}}" PARENT_SCOPE)
-	endforeach(suffix)
-    endif(fip_KERNEL)
-endfunction(fill_install_prefixes project_name project_prefix)
-
-
-########################################################################
-# Kernel-dependent paths.
-#
-# Some deliverables may depends on linux kernel.
-#
-# For make "one user installation for several kernels" paradigm works,
-# installation directory for that deliverables should include
-# kernel-version part(like "3.10.2-generic").
-#
-# So, components installed by user installation can determine at runtime,
-# which kernel-dependent deliverable should be used on currently loaded system.
-# They do selection using 'uname -r' request.
-#
-# For define variables represented kernel-dependent directories,
-# we use strings containing "%kernel%" stem.
-
-#  kernel_path(kernel_version RESULT_VARIABLE pattern ...)
-#
-# Form concrete path representation from kernel-dependent pattern(s).
-# Replace occurence of %kernel% in pattern(s) with given @kernel_version string.
-# Result is stored in the RESULT_VARIABLE.
-#
-# @kernel_version may be concrete version of the kernel,
-# or variable reference in some language.
-macro(kernel_path kernel_version RESULT_VARIABLE pattern)
-    string(REPLACE "%kernel%" "${kernel_version}" ${RESULT_VARIABLE} ${pattern} ${ARGN})
-endmacro(kernel_path kernel_version RESULT_VARIABLE pattern)
diff --git a/openair2/UTIL/OTG/otg_rx.c b/openair2/UTIL/OTG/otg_rx.c
index 135378ff3b..eb123e7216 100644
--- a/openair2/UTIL/OTG/otg_rx.c
+++ b/openair2/UTIL/OTG/otg_rx.c
@@ -37,12 +37,6 @@
 #include "otg_form.h"
 #include "otg_kpi.h"
 
-#ifdef ENABLE_DB_STATS
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <sql_common.h>
-#endif
-
 extern uint16_t NB_UE_INST;
 
 //#include "LAYER2/MAC/extern.h"