diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a5787b6f247dbc02a8d8985dea2d7f800ad50cf..da9dc743397dba6ff9793f33492ee7070284e720 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,9 +148,6 @@ ADD_SUBDIRECTORY( MeshLib )
 ADD_SUBDIRECTORY( MeshGeoToolsLib )
 ADD_SUBDIRECTORY( NumLib )
 ADD_SUBDIRECTORY( ProcessLib )
-IF( OGS_BUILD_CLI )
-	ADD_SUBDIRECTORY( OGS )
-ENDIF() # OGS_BUILD_CLI
 IF( OGS_BUILD_TESTS AND NOT IS_SUBPROJECT )
 	IF(CMAKE_VERSION VERSION_LESS 2.8.11)
 		MESSAGE(FATAL_ERROR "CMAKE 2.8.11 or higher is required to build the tests!")
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 37e885ffe03f2a777b3ccd3151410afd4cda3c48..8257ba0d0c6d8c4b56e4ca28d1393cf1318e3fe0 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -756,7 +756,6 @@ INPUT                  = ${CMAKE_SOURCE_DIR}/Applications \
                          ${CMAKE_SOURCE_DIR}/MathLib \
                          ${CMAKE_SOURCE_DIR}/MeshLib \
                          ${CMAKE_SOURCE_DIR}/NumLib \
-                         ${CMAKE_SOURCE_DIR}/OGS \
                          ${CMAKE_SOURCE_DIR}/ProcessLib \
                          ${CMAKE_SOURCE_DIR}/README.md \
                          ${CMAKE_SOURCE_DIR}/SimpleTests \
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 00b4bac14000e6b5eea9aab2eb465f7eda856535..1c09aec5d5e711fa03bf26654af1cf10510827ec 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../OGS
 	${CMAKE_CURRENT_BINARY_DIR}/../BaseLib
 )
 
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index 5a320ba63858dbf08d0c4d0f80165a3a2f4f10ec..7b90a8624789e0747daad91252979b869ec213cd 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLibGEOTOOLS
-	${CMAKE_CURRENT_SOURCE_DIR}/../OGS
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/Base
 	${CMAKE_CURRENT_BINARY_DIR}/DataView
@@ -76,7 +75,6 @@ TARGET_LINK_LIBRARIES( ogs-gui
 	FileIO
 	MeshLib
 	#MSHGEOTOOLS
-	OgsLib
 	QtBase
 	QtDataView
 	StratView
diff --git a/Gui/DataView/CMakeLists.txt b/Gui/DataView/CMakeLists.txt
index 9f46ecc382e8ffffd4b0335a62ad7f111eac9a24..3e820c31f005a59190831cfc38506f20aecb19f4 100644
--- a/Gui/DataView/CMakeLists.txt
+++ b/Gui/DataView/CMakeLists.txt
@@ -138,7 +138,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 67f31ec12ce24d2af54a72039e18baa51f62eb7f..df82604fe250532cafbd6a8ac47fc2492bcbaf5e 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -135,7 +135,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
 	${CMAKE_CURRENT_SOURCE_DIR}/../Base
 	${CMAKE_CURRENT_SOURCE_DIR}/../DataView
 	${CMAKE_CURRENT_BINARY_DIR}/../DataView
diff --git a/OGS/CMakeLists.txt b/OGS/CMakeLists.txt
deleted file mode 100644
index 6f6e67c602888ca12185261ee7df1664cb60e17b..0000000000000000000000000000000000000000
--- a/OGS/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Source files
-GET_SOURCE_FILES(SOURCES_OGSLIB)
-SET ( SOURCES ${SOURCES_OGSLIB})
-
-# Create the library
-ADD_LIBRARY(OgsLib STATIC ${SOURCES})
-
-include_directories(
-	.
-	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
-)
-
-
-target_link_libraries (OgsLib
-	AssemblerLib
-	BaseLib
-	FileIO
-	GeoLib
-	MeshLib
-)
-
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 72069e17af29e88f8b9c89d39a2b7939a9d58115..7c15e9837b31e5bbca90465f4ace8af5b5fa594f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -53,7 +53,6 @@ TARGET_LINK_LIBRARIES(testrunner
 	MeshLib
 	MeshGeoToolsLib
 	NumLib
-	OgsLib
 	logog
 	${BOOST_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT}
diff --git a/Utils/FileConverter/CMakeLists.txt b/Utils/FileConverter/CMakeLists.txt
index a40352dec986e99c29b2061b21cdc3921345e81f..e45789b910a62e04def6eec3174c528192adbcc5 100644
--- a/Utils/FileConverter/CMakeLists.txt
+++ b/Utils/FileConverter/CMakeLists.txt
@@ -17,7 +17,6 @@ IF (QT4_FOUND)
 		FileIO
 		GeoLib
 		BaseLib
-		OgsLib
 		shp
 		${QT_LIBRARIES}
 	)
@@ -29,7 +28,6 @@ IF (QT4_FOUND)
 		ApplicationsLib
 		FileIO
 		GeoLib
-		OgsLib
 		${QT_LIBRARIES}
 	)
 
@@ -38,7 +36,6 @@ IF (QT4_FOUND)
 		ApplicationsLib
 		FileIO
 		GeoLib
-		OgsLib
 		${QT_LIBRARIES}
 	)