diff --git a/cmake/buildOptions.cmake b/cmake/buildOptions.cmake
index 1f5b5ae9..7df1b256 100644
--- a/cmake/buildOptions.cmake
+++ b/cmake/buildOptions.cmake
@@ -114,10 +114,7 @@ EVAL(FETCH_BITPOLYMUL_IMPL
 	((NOT DEFINED FETCH_BITPOLYMUL) AND (FETCH_AUTO AND ENABLE_BITPOLYMUL)))
 
 	
-#option(FETCH_BITPOLYMUL		"download and build bitpolymul" OFF))
-EVAL(FETCH_LIBDIVIDE_IMPL 
-	(DEFINED FETCH_LIBDIVIDE AND FETCH_LIBDIVIDE) OR
-	((NOT DEFINED FETCH_LIBDIVIDE) AND (FETCH_AUTO)))
+
 
 
 option(VERBOSE_FETCH        "Print build info for fetched libraries" ON)
@@ -126,8 +123,7 @@ option(VERBOSE_FETCH        "Print build info for fetched libraries" ON)
 message(STATUS "General Options\n=======================================================")
 
 message(STATUS "Option: VERBOSE_FETCH         = ${VERBOSE_FETCH}")
-message(STATUS "Option: FETCH_BITPOLYMUL      = ${FETCH_BITPOLYMUL_IMPL}")
-message(STATUS "Option: FETCH_LIBDIVIDE       = ${FETCH_LIBDIVIDE_IMPL}\n")
+message(STATUS "Option: FETCH_BITPOLYMUL      = ${FETCH_BITPOLYMUL_IMPL}\n")
 
 message(STATUS "Option: ENABLE_ALL_OT         = ON/OFF")
 message(STATUS "Option: ENABLE_BITPOLYMUL     = ${ENABLE_BITPOLYMUL}")
diff --git a/cmake/libOTeDepHelper.cmake b/cmake/libOTeDepHelper.cmake
index 2ff9ef34..00b3f6b8 100644
--- a/cmake/libOTeDepHelper.cmake
+++ b/cmake/libOTeDepHelper.cmake
@@ -58,46 +58,6 @@ endif()
 
 
 
-#######################################
-# libDivide
-
-macro(FIND_LIBDIVIDE)
-    set(ARGS ${ARGN})
-
-    #explicitly asked to fetch libdivide
-    if(FETCH_LIBDIVIDE)
-        list(APPEND ARGS NO_DEFAULT_PATH PATHS ${VOLEPSI_THIRDPARTY_DIR})
-    endif()
-
-    find_path(LIBDIVIDE_INCLUDE_DIRS "libdivide.h" PATH_SUFFIXES "include" ${ARGS})
-    if(EXISTS "${LIBDIVIDE_INCLUDE_DIRS}/libdivide.h")
-        set(LIBDIVIDE_FOUND ON)
-    else()
-        set(LIBDIVIDE_FOUND OFF)
-    endif()
-
-endmacro()
-
-if(FETCH_LIBDIVIDE_IMPL)
-    FIND_LIBDIVIDE(QUIET)
-    include(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getLibDivide.cmake)
-endif()
-
-FIND_LIBDIVIDE(REQUIRED)
-
-if(NOT TARGET libdivide)
-    add_library(libdivide INTERFACE IMPORTED)
-
-    target_include_directories(libdivide INTERFACE 
-                    $<BUILD_INTERFACE:${LIBDIVIDE_INCLUDE_DIRS}>
-                    $<INSTALL_INTERFACE:>)
-endif()
-
-message(STATUS "LIBDIVIDE_INCLUDE_DIRS:  ${LIBDIVIDE_INCLUDE_DIRS}")
-
-
-
-
 # resort the previous prefix path
 set(CMAKE_PREFIX_PATH ${PUSHED_CMAKE_PREFIX_PATH})
 cmake_policy(POP)
\ No newline at end of file
diff --git a/cryptoTools b/cryptoTools
index e5a1f993..ffc952ab 160000
--- a/cryptoTools
+++ b/cryptoTools
@@ -1 +1 @@
-Subproject commit e5a1f99361a548e54d8b70f61e2bbb82b84c9378
+Subproject commit ffc952ab2ca800f913e6ca5d4f712401ca4a6085
diff --git a/libOTe/Tools/EACode/EACode.cpp b/libOTe/Tools/EACode/EACode.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/libOTe/Tools/EACode/EACode.h b/libOTe/Tools/EACode/EACode.h
index 95282af8..be55eb36 100644
--- a/libOTe/Tools/EACode/EACode.h
+++ b/libOTe/Tools/EACode/EACode.h
@@ -371,12 +371,9 @@ namespace osuCrypto
 
                 switch (mExpanderWeight)
                 {
-                    CASE(5);
                     CASE(7);
-                    CASE(9);
                     CASE(11);
                     CASE(21);
-                    CASE(40);
                 default:
                     for (u64 jj = 0; jj < 8; ++jj)
                     {
diff --git a/thirdparty/getLibDivide.cmake b/thirdparty/getLibDivide.cmake
deleted file mode 100644
index 17db3ca0..00000000
--- a/thirdparty/getLibDivide.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-set(DEP_NAME            libdivide)
-set(GIT_REPOSITORY      https://github.com/ridiculousfish/libdivide.git)
-set(GIT_TAG             "b322221677351ebb11f0a42fe9a9a2794da5bfe5" )
-
-set(CLONE_DIR "${OC_THIRDPARTY_CLONE_DIR}/${DEP_NAME}")
-set(BUILD_DIR "${CLONE_DIR}/out/build/${VOLEPSI_CONFIG}")
-set(LOG_FILE  "${CMAKE_CURRENT_LIST_DIR}/log-${DEP_NAME}.txt")
-
-
-include("${CMAKE_CURRENT_LIST_DIR}/fetch.cmake")
-
-if(NOT LIBDIVIDE_FOUND)
-    find_program(GIT git REQUIRED)
-    set(DOWNLOAD_CMD  ${GIT} clone ${GIT_REPOSITORY})
-    set(CHECKOUT_CMD  ${GIT} checkout ${GIT_TAG})
-    
-    #set(INSTALL_CMD   ${CMAKE_COMMAND} --install ${BUILD_DIR} --prefix ${VOLEPSI_THIRDPARTY_DIR})
-
-
-    message("============= Building ${DEP_NAME} =============")
-    if(NOT EXISTS ${CLONE_DIR})
-        run(NAME "Cloning ${GIT_REPOSITORY}" CMD ${DOWNLOAD_CMD} WD ${OC_THIRDPARTY_CLONE_DIR})
-    endif()
-
-    run(NAME "Checkout ${GIT_TAG} " CMD ${CHECKOUT_CMD}  WD ${CLONE_DIR})
-    message("Install: cp ${CLONE_DIR}/libdivide.h  ${OC_THIRDPARTY_INSTALL_PREFIX}/include/")
-    file(COPY ${CLONE_DIR}/libdivide.h DESTINATION ${OC_THIRDPARTY_INSTALL_PREFIX}/include/)
-    message("log ${LOG_FILE}\n==========================================")
-else()
-    message("${DEP_NAME} already fetched.")
-endif()
-
-install(CODE "
-    if(NOT CMAKE_INSTALL_PREFIX STREQUAL \"${OC_THIRDPARTY_INSTALL_PREFIX}\")
-        file(INSTALL ${CLONE_DIR}/libdivide.h DESTINATION \${CMAKE_INSTALL_PREFIX}/include/)
-    endif()
-")
\ No newline at end of file