diff --git a/Android.bp b/Android.bp
index 4a99792..07487e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -123,7 +123,6 @@
         "clframework/src/core/CL/kernels/CLGaussian3x3Kernel.cpp",
         "clframework/src/core/CL/kernels/CLGaussian5x5Kernel.cpp",
         "clframework/src/core/CL/kernels/CLGaussianPyramidKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMInterleave4x4Kernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp",
@@ -141,7 +140,6 @@
         "clframework/src/core/CL/kernels/CLGEMMMatrixVectorMultiplyKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMReshapeLHSMatrixKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMReshapeRHSMatrixKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMTranspose1xWKernel.cpp",
         "clframework/src/core/CL/kernels/CLGenerateProposalsLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLHarrisCornersKernel.cpp",
         "clframework/src/core/CL/kernels/CLHeightConcatenateLayerKernel.cpp",
@@ -436,7 +434,6 @@
         "clframework/src/runtime/CL/functions/CLCropResize.cpp",
         "clframework/src/runtime/CL/functions/CLDeconvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLDeconvolutionLayerUpsample.cpp",
-        "clframework/src/runtime/CL/functions/CLDepthConcatenateLayer.cpp",
         "clframework/src/runtime/CL/functions/CLDepthConvertLayer.cpp",
         "clframework/src/runtime/CL/functions/CLDepthwiseConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp",
@@ -465,10 +462,8 @@
         "clframework/src/runtime/CL/functions/CLGEMMConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLGEMM.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMDeconvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMLowpOutputStage.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMTranspose1xW.cpp",
         "clframework/src/runtime/CL/functions/CLGenerateProposalsLayer.cpp",
         "clframework/src/runtime/CL/functions/CLHarrisCorners.cpp",
         "clframework/src/runtime/CL/functions/CLHistogram.cpp",
@@ -528,7 +523,6 @@
         "clframework/src/runtime/CL/functions/CLUpsampleLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWarpAffine.cpp",
         "clframework/src/runtime/CL/functions/CLWarpPerspective.cpp",
-        "clframework/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp",
         "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp",
@@ -586,7 +580,6 @@
         "clframework/src/runtime/NEON/functions/NECopy.cpp",
         "clframework/src/runtime/NEON/functions/NECropResize.cpp",
         "clframework/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEDepthConvertLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp",
@@ -677,7 +670,6 @@
         "clframework/src/runtime/NEON/functions/NEUpsampleLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEWarpAffine.cpp",
         "clframework/src/runtime/NEON/functions/NEWarpPerspective.cpp",
-        "clframework/src/runtime/NEON/functions/NEWidthConcatenateLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEYOLOLayer.cpp",
         "clframework/src/runtime/NEON/INESimpleFunction.cpp",