diff --git a/README.md b/README.md
index 2ff3c431..fe863544 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 This is very basic Android Studio baresip project.
 
-Includes PCMU/PCMA, speex, and opus codecs as well as ZRTP media
-encapsulation.
+Includes PCMU/PCMA and opus codecs as well as ZRTP media encapsulation.
 
 The static libraries and include files in distribution directory have
 been produced using https://github.com/alfredh/baresip-android.
+
+After cloning the project, in android-studio File -> Invalidate Caches /
+Restart -> Invalidate & Restart.
diff --git a/app/src/main/assets/accounts b/app/src/main/assets/accounts
index 26670188..611c1428 100644
--- a/app/src/main/assets/accounts
+++ b/app/src/main/assets/accounts
@@ -8,7 +8,7 @@
 #
 #  addr-params:
 #    ;answermode={manual,early,auto}
-#    ;audio_codecs=speex/16000,pcma,...
+#    ;audio_codecs=opus,pcma,...
 #    ;auth_user=username
 #    ;mediaenc={srtp,srtp-mand,srtp-mandf,dtls_srtp,zrtp}
 #    ;medianat={stun,turn,ice}
@@ -31,4 +31,4 @@
 #  <sip:user@1.2.3.4;auth_pass=secret;transport=tcp>
 #  <sip:user@[2001:df8:0:16:216:6fff:fe91:614c]:5070;transport=tcp;auth_pass=secret>
 #
-<sip:foo@test.tutpro.com>;auth_user=foo;auth_pass=xxx;outbound="sip:192.168.43.98:5060;transport=tcp";ptime=20;audio_codecs=OPUS/48000/2,speex/16000,speex/8000,PCMU,PCMA;video_codecs="";regint=600;pubint=0;sipnat=outbound
+<sip:foo@test.tutpro.com>;auth_user=foo;auth_pass=xxx;outbound="sip:192.168.43.98:5060;transport=tcp";ptime=20;audio_codecs=OPUS/48000/2,PCMU,PCMA;video_codecs="";regint=600;pubint=0;sipnat=outbound
diff --git a/app/src/main/assets/config b/app/src/main/assets/config
index fddee23c..8b43d60c 100644
--- a/app/src/main/assets/config
+++ b/app/src/main/assets/config
@@ -72,7 +72,6 @@ module			opus.so
 module			g711.so
 #module			gsm.so
 #module			l16.so
-module			speex.so
 #module			bv32.so
 #module			mpa.so
 #module			codec2.so
@@ -82,8 +81,6 @@ module			speex.so
 # Audio filter Modules (in encoding order)
 #module			vumeter.so
 #module			sndfile.so
-#module			speex_aec.so
-#module			speex_pp.so
 #module			plc.so
 
 # Audio driver Modules
@@ -170,16 +167,6 @@ http_listen		0.0.0.0:8000
 
 evdev_device	/dev/input/event0
 
-# Speex codec parameters
-speex_quality		7 # 0-10
-speex_complexity	7 # 0-10
-speex_enhancement	0 # 0-1
-speex_mode_nb		3 # 1-6
-speex_mode_wb		6 # 1-6
-speex_vbr		    0 # Variable Bit Rate 0-1
-speex_vad		    0 # Voice Activity Detection 0-1
-speex_agc_level		8000
-
 # Opus codec parameters
 opus_bitrate		28000 # 6000-510000
 opus_cbr		    no
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 09479956..31d28db8 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -36,10 +36,6 @@ add_library(lib_rem STATIC IMPORTED)
 set_target_properties(lib_rem PROPERTIES IMPORTED_LOCATION
     ${distribution_DIR}/rem/lib/${ANDROID_ABI}/librem.a)
 
-add_library(lib_speex STATIC IMPORTED)
-set_target_properties(lib_speex PROPERTIES IMPORTED_LOCATION
-        ${distribution_DIR}/speex/lib/${ANDROID_ABI}/libspeex.a)
-
 add_library(lib_opus STATIC IMPORTED)
 set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
         ${distribution_DIR}/opus/lib/${ANDROID_ABI}/libopus.a)
@@ -72,7 +68,6 @@ target_link_libraries(baresip
                       lib_re
                       lib_ssl
                       lib_crypto
-                      lib_speex
                       lib_opus
                       lib_zrtp
                       lib_bn