diff --git a/library.json b/library.json
index e46fcbda..49b9d20b 100644
--- a/library.json
+++ b/library.json
@@ -1,59 +1,47 @@
 {
   "name": "googletest",
   "keywords": "unittest, unit, test, gtest, gmock",
   "description": "googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and constraints in mind. No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And it supports any kind of tests, not just unit tests.",
    "license": "BSD-3-Clause",
   "homepage": "https://github.com/google/googletest/blob/master/README.md",
   "repository": {
     "type": "git",
     "url": "https://github.com/google/googletest.git"
   },
   "version": "1.8.1",
   "frameworks": "arduino",
   "platforms": [
         "espressif32"
   ],
   "export": {
         "include": [
             "googlemock/include/*",
             "googlemock/src/*",
             "googletest/include/*",
             "googletest/src/*"
         ],
         "exclude": [
             "ci",
-            "googlemock/build-aux",
             "googlemock/cmake",
-            "googlemock/make",
-            "googlemock/msvc",
             "googlemock/scripts",
             "googlemock/src/gmock-all.cc",
             "googlemock/src/gmock_main.cc",
             "googlemock/test",
             "googlemock/CMakeLists.txt",
-            "googlemock/Makefile.am",
-            "googlemock/configure.ac",
             "googletest/cmake",
-            "googletest/codegear",
-            "googletest/m4",
-            "googletest/make",
-            "googletest/msvc",
             "googletest/scripts",
             "googletest/src/gtest-all.cc",
             "googletest/src/gtest_main.cc",
             "googletest/test",
-            "googletest/xcode",
             "googletest/CMakeLists.txt",
-            "googletest/Makefile.am",
-            "googletest/configure.ac"
           ]
   },
   "build": {
         "flags": [
             "-Igooglemock/include",
             "-Igooglemock",
             "-Igoogletest/include",
             "-Igoogletest"
         ]
   }
 }
diff --git a/platformio.ini b/platformio.ini
index 3910026b..94495e80 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,31 +1,31 @@
 ; PlatformIO Project Configuration File
 ;
 ;   Build options: build flags, source filter
 ;   Upload options: custom upload port, speed and extra flags
 ;   Library options: dependencies, extra library storages
 ;   Advanced options: extra scripting
 ;
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
 
 [platformio]
 #src_dir = ./googlemock
 #src_dir = ./googletest
 src_dir = .
 
 [env:googletest_esp32]
 platform = espressif32
 board = esp32dev
 framework = arduino
 build_flags = -I./googletest/include -I./googletest
-src_filter = +<*> -<.git/> -<googlemock> -<googletest/codegear/> -<googletest/samples> -<googletest/test/> -<googletest/xcode> -<googletest/src> +<googletest/src/gtest-all.cc> +<googletest/src/gtest_main.cc>
+src_filter = +<*> -<.git/> -<googlemock> -<googletest/samples> -<googletest/test/> -<googletest/src> +<googletest/src/gtest-all.cc> +<googletest/src/gtest_main.cc>
 upload_speed = 921600
 
 [env:googlemock_esp32]
 platform = espressif32
 board = esp32dev
 framework = arduino
 build_flags = -I./googlemock/include -I./googletest/include -I./googletest -I./googlemock
 src_filter = +<*> -<.git/> -<googletest> -<googlemock/test/> -<googlemock/src> +<googlemock/src/gmock-all.cc> +<googlemock/src/gmock_main.cc> +<googletest/src/gtest-all.cc>
 upload_speed = 921600