diff --git a/.astyleignore b/.astyleignore
index 71141325c6..3ff69b5988 100644
--- a/.astyleignore
+++ b/.astyleignore
@@ -2,17 +2,13 @@ BUILD
 cmsis
 features/cryptocell
 features/mbedtls
-features/FEATURE_LWIP/lwip
+features/lwipstack/lwip
 rtos/TARGET_CORTEX/rtx4
 features/filesystem/littlefs/littlefs
 features/filesystem/fat/ChaN
 features/frameworks
 features/FEATURE_BLE/targets
-features/FEATURE_LWIP/lwip-interface/lwip
 features/unsupported/
-features/FEATURE_COMMON_PAL/
-FEATURE_NANOSTACK/coap-service
-FEATURE_NANOSTACK/sal-stack-nanostack
 rtos/TARGET_CORTEX/rtx5
 targets
 tools
diff --git a/.travis.yml b/.travis.yml
index 94a7eb1598..1b3be03b00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,7 +162,7 @@ matrix:
         - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
-        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity BUILD
+        - rm -r rtos features/cellular features/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
         - make -C $EVENTS/equeue test