diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98da62bdc..02e3a1a05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,9 +129,6 @@ add_subdirectory(libethcore)
 add_subdirectory(libevm)
 add_subdirectory(libethereum)
 
-# TODO is this 'TODO remove' still valid?
-#	add_subdirectory(libethereumx)	 # TODO remove
-
 add_subdirectory(libwebthree)
 add_subdirectory(test)
 add_subdirectory(eth)
diff --git a/exp/CMakeLists.txt b/exp/CMakeLists.txt
index 49bbbf16b..d0aadc8ae 100644
--- a/exp/CMakeLists.txt
+++ b/exp/CMakeLists.txt
@@ -10,11 +10,8 @@ set(EXECUTABLE exp)
 
 add_executable(${EXECUTABLE} ${SRC_LIST})
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} p2p)
-target_link_libraries(${EXECUTABLE} gmp)
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin) 
 
diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt
index c0fa56026..20eab916a 100644
--- a/libdevcrypto/CMakeLists.txt
+++ b/libdevcrypto/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_policy(SET CMP0015 OLD)
+cmake_policy(SET CMP0015 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
 if (${CMAKE_MAJOR_VERSION} GREATER 2)