diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 4665428ee..358bcb0ce 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
 
 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
 
-#Change C++ file extension as appropriate
+# Change C++ file extension as appropriate
 LOCAL_CPP_EXTENSION := .cpp
 
 ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
@@ -52,6 +52,8 @@ LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS)
 ifneq ($(NDK_R7_TOOLCHAIN)$(CRYSTAX_R7_TOOLCHAIN),) # NDK r7 broke it even more
 LOCAL_C_INCLUDES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/include
 LOCAL_LDLIBS += -L$(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI) -lgnustl_static
+# You can have multiple C++ file extensions starting from NDK r7
+LOCAL_CPP_EXTENSION := .cpp .cxx .cc
 else
 ifneq ($(NDK_R6_TOOLCHAIN),) # NDK r6 broke it
 LOCAL_C_INCLUDES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/include
diff --git a/project/jni/application/teeworlds/cleanConfig.sh b/project/jni/application/teeworlds/cleanConfig.sh
deleted file mode 100755
index 289fe1755..000000000
--- a/project/jni/application/teeworlds/cleanConfig.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-adb shell rm -r /data/data/com.teeworlds/files/.teeworlds