diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9227a618f..af4fcd070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,8 +69,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(${PROJECT_NAME} PRIVATE
         $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
-        -fno-strict-aliasing
-        -ffast-math)
+        -fno-strict-aliasing)
 elseif(MSVC)
 	target_compile_options(${PROJECT_NAME} PRIVATE /GR- /GS-)
 endif()
diff --git a/core/core.mk b/core/core.mk
index 33cf70e04..64e55778f 100755
--- a/core/core.mk
+++ b/core/core.mk
@@ -53,10 +53,6 @@ else
     RZDCY_MODULES += rend/norend/
 endif
 
-ifdef FOR_ANDROID
-    RZDCY_MODULES += android/ deps/libandroid/ linux/
-endif
-
 ifdef USE_SDL
     RZDCY_MODULES += sdl/
 endif
@@ -84,33 +80,13 @@ RZDCY_CFLAGS	+= \
 	-frename-registers -fsingle-precision-constant -ffast-math \
 	-ftree-vectorize -fomit-frame-pointer
 	RZDCY_CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon
-else
-	ifdef FOR_ANDROID
-RZDCY_CFLAGS	+= \
-		$(CFLAGS) -c -O3 \
-		-D_ANDROID -DNDEBUG \
-		-frename-registers -fsingle-precision-constant -ffast-math \
-		-ftree-vectorize -fomit-frame-pointer
-
-		ifndef NOT_ARM
-			RZDCY_CFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16
-		else
-			ifdef ISARM64
-				RZDCY_CFLAGS += -march=armv8-a
-			endif
-		endif
-	endif
 endif
 
 ifdef USE_VULKAN
 	ifdef FOR_WINDOWS
 		RZDCY_CFLAGS += -DVK_USE_PLATFORM_WIN32_KHR
 	else
-		ifdef FOR_ANDROID
-			RZDCY_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-		else
-			RZDCY_CFLAGS += -DVK_USE_PLATFORM_XLIB_KHR
-		endif
+		RZDCY_CFLAGS += -DVK_USE_PLATFORM_XLIB_KHR
 	endif
 	RZDCY_CFLAGS += -D USE_VULKAN
 endif
diff --git a/core/hw/sh4/dyna/shil_canonical.h b/core/hw/sh4/dyna/shil_canonical.h
index f35b812d7..9971e80e8 100644
--- a/core/hw/sh4/dyna/shil_canonical.h
+++ b/core/hw/sh4/dyna/shil_canonical.h
@@ -715,7 +715,7 @@ u32,f1,(f32 f1),
 		s32 res = (s32)f1;
 
 		// Fix result sign for Intel CPUs
-		if (res == 0x80000000 && *(s32 *)&f1 > 0)
+		if ((u32)res == 0x80000000 && f1 == f1 && *(s32 *)&f1 > 0)
 			res = 0x7fffffff;
 
 		return res;
@@ -903,13 +903,12 @@ shil_canonical
 (
 f32,f1,(float* fn, float* fm),
 
-	// multiplications are done with 28 bits of precision (53 - 25) and the final sum at 30 bits
-	double idp = reduce_precision<25>((double)fn[0] * fm[0]);
-	idp += reduce_precision<25>((double)fn[1] * fm[1]);
-	idp += reduce_precision<25>((double)fn[2] * fm[2]);
-	idp += reduce_precision<25>((double)fn[3] * fm[3]);
+	double idp = (double)fn[0] * fm[0];
+	idp += (double)fn[1] * fm[1];
+	idp += (double)fn[2] * fm[2];
+	idp += (double)fn[3] * fm[3];
 
-	return (float)fixNaN64(idp);
+	return fixNaN((float)idp);
 )
 #else
 shil_canonical
@@ -944,30 +943,30 @@ shil_canonical
 (
 void,f1,(float* fd,float* fn, float* fm),
 
-	double v1 = reduce_precision<25>((double)fm[0]  * fn[0]) +
-				reduce_precision<25>((double)fm[4]  * fn[1]) +
-				reduce_precision<25>((double)fm[8]  * fn[2]) +
-				reduce_precision<25>((double)fm[12] * fn[3]);
+	double v1 = (double)fm[0]  * fn[0] +
+				(double)fm[4]  * fn[1] +
+				(double)fm[8]  * fn[2] +
+				(double)fm[12] * fn[3];
 
-	double v2 = reduce_precision<25>((double)fm[1]  * fn[0]) +
-				reduce_precision<25>((double)fm[5]  * fn[1]) +
-				reduce_precision<25>((double)fm[9]  * fn[2]) +
-				reduce_precision<25>((double)fm[13] * fn[3]);
+	double v2 = (double)fm[1]  * fn[0] +
+				(double)fm[5]  * fn[1] +
+				(double)fm[9]  * fn[2] +
+				(double)fm[13] * fn[3];
 
-	double v3 = reduce_precision<25>((double)fm[2]  * fn[0]) +
-				reduce_precision<25>((double)fm[6]  * fn[1]) +
-				reduce_precision<25>((double)fm[10] * fn[2]) +
-				reduce_precision<25>((double)fm[14] * fn[3]);
+	double v3 = (double)fm[2]  * fn[0] +
+				(double)fm[6]  * fn[1] +
+				(double)fm[10] * fn[2] +
+				(double)fm[14] * fn[3];
 
-	double v4 = reduce_precision<25>((double)fm[3]  * fn[0]) +
-				reduce_precision<25>((double)fm[7]  * fn[1]) +
-				reduce_precision<25>((double)fm[11] * fn[2]) +
-				reduce_precision<25>((double)fm[15] * fn[3]);
+	double v4 = (double)fm[3]  * fn[0] +
+				(double)fm[7]  * fn[1] +
+				(double)fm[11] * fn[2] +
+				(double)fm[15] * fn[3];
 
-	fd[0] = (float)fixNaN64(v1);
-	fd[1] = (float)fixNaN64(v2);
-	fd[2] = (float)fixNaN64(v3);
-	fd[3] = (float)fixNaN64(v4);
+	fd[0] = fixNaN((float)v1);
+	fd[1] = fixNaN((float)v2);
+	fd[2] = fixNaN((float)v3);
+	fd[3] = fixNaN((float)v4);
 )
 #else
 shil_canonical
diff --git a/core/hw/sh4/interpr/sh4_fpu.cpp b/core/hw/sh4/interpr/sh4_fpu.cpp
index 9ef33bf9e..efce83d94 100644
--- a/core/hw/sh4/interpr/sh4_fpu.cpp
+++ b/core/hw/sh4/interpr/sh4_fpu.cpp
@@ -19,7 +19,7 @@
 
 #define pi (3.14159265f)
 
-void iNimp(const char*str);
+static void iNimp(const char *str);
 
 #define IS_DENORMAL(f) (((*(f))&0x7f800000) == 0)
 
@@ -168,14 +168,14 @@ sh4op(i1111_nnnn_mmmm_0100)
 		u32 n = GetN(op);
 		u32 m = GetM(op);
 
-		sr.T = !!(fr[m] == fr[n]);
+		sr.T = fr[m] == fr[n];
 	}
 	else
 	{
 		u32 n = (op >> 9) & 0x07;
 		u32 m = (op >> 5) & 0x07;
 
-		sr.T = !!(GetDR(m) == GetDR(n));
+		sr.T = GetDR(m) == GetDR(n);
 	}
 }
 //fcmp/gt <FREG_M>,<FREG_N>
@@ -339,7 +339,6 @@ sh4op(i1111_nnnn_mmmm_1011)
 {
 	if (fpscr.SZ == 0)
 	{
-		//iNimp("fmov.s <FREG_M>,@-<REG_N>");
 		u32 n = GetN(op);
 		u32 m = GetM(op);
 
@@ -505,12 +504,12 @@ sh4op(i1111_nnmm_1110_1101)
 	{
 #if HOST_CPU == CPU_X86 || HOST_CPU == CPU_X64
 		// multiplications are done with 28 bits of precision (53 - 25) and the final sum at 30 bits
-		double idp = reduce_precision<25>((double)fr[n + 0] * fr[m + 0]);
-		idp += reduce_precision<25>((double)fr[n + 1] * fr[m + 1]);
-		idp += reduce_precision<25>((double)fr[n + 2] * fr[m + 2]);
-		idp += reduce_precision<25>((double)fr[n + 3] * fr[m + 3]);
+		double idp = (double)fr[n + 0] * fr[m + 0];
+		idp += (double)fr[n + 1] * fr[m + 1];
+		idp += (double)fr[n + 2] * fr[m + 2];
+		idp += (double)fr[n + 3] * fr[m + 3];
 
-		fr[n + 3] = (float)fixNaN64(idp);
+		fr[n + 3] = fixNaN((float)idp);
 #else
 		float rv = fr[n + 0] * fr[m + 0];
 		rv += fr[n + 1] * fr[m + 1];
@@ -604,7 +603,6 @@ sh4op(i1111_1011_1111_1101)
 //fschg
 sh4op(i1111_0011_1111_1101)
 {
-	//iNimp("fschg");
 	fpscr.SZ = 1 - fpscr.SZ;
 }
 
@@ -634,10 +632,12 @@ sh4op(i1111_nnnn_0011_1101)
 	if (fpscr.PR == 0)
 	{
 		u32 n = GetN(op);
-		fpul = (u32)(s32)std::min(fr[n], 2147483520.0f);     // IEEE 754: 0x4effffff
+		fpul = (u32)(s32)fr[n];
 
+		if ((s32)fpul > 0x7fffff80)
+			fpul = 0x7fffffff;
 		// Intel CPUs convert out of range float numbers to 0x80000000. Manually set the correct sign
-		if (fpul == 0x80000000)
+		else if (fpul == 0x80000000 && fr[n] == fr[n])
 		{
 			if (*(int *)&fr[n] > 0) // Using integer math to avoid issues with Inf and NaN
 				fpul--;
@@ -649,8 +649,9 @@ sh4op(i1111_nnnn_0011_1101)
 		f64 f = GetDR(n);
 		fpul = (u32)(s32)f;
 
+		// TODO saturate
 		// Intel CPUs convert out of range float numbers to 0x80000000. Manually set the correct sign
-		if (fpul == 0x80000000)
+		if (fpul == 0x80000000 && f == f)
 		{
 			if (*(s64 *)&f > 0)     // Using integer math to avoid issues with Inf and NaN
 				fpul--;
@@ -662,7 +663,6 @@ sh4op(i1111_nnnn_0011_1101)
 //fmac <FREG_0>,<FREG_M>,<FREG_N>
 sh4op(i1111_nnnn_mmmm_1110)
 {
-	//iNimp("fmac <FREG_0>,<FREG_M>,<FREG_N>");
 	if (fpscr.PR==0)
 	{
 		u32 n = GetN(op);
@@ -681,15 +681,11 @@ sh4op(i1111_nnnn_mmmm_1110)
 //ftrv xmtrx,<FV_N>
 sh4op(i1111_nn01_1111_1101)
 {
-	//iNimp("ftrv xmtrx,<FV_N>");
-
 	/*
 	XF[0] XF[4] XF[8] XF[12]    FR[n]      FR[n]
 	XF[1] XF[5] XF[9] XF[13]  *	FR[n+1] -> FR[n+1]
 	XF[2] XF[6] XF[10] XF[14]   FR[n+2]    FR[n+2]
 	XF[3] XF[7] XF[11] XF[15]   FR[n+3]    FR[n+3]
-	
-	gota love linear algebra !
 	*/
 
 	u32 n=GetN(op)&0xC;
@@ -697,30 +693,30 @@ sh4op(i1111_nn01_1111_1101)
 	if (fpscr.PR==0)
 	{
 #if HOST_CPU == CPU_X86 || HOST_CPU == CPU_X64
-		double v1 = reduce_precision<25>((double)xf[0]  * fr[n + 0]) +
-					reduce_precision<25>((double)xf[4]  * fr[n + 1]) +
-					reduce_precision<25>((double)xf[8]  * fr[n + 2]) +
-					reduce_precision<25>((double)xf[12] * fr[n + 3]);
+		double v1 = (double)xf[0]  * fr[n + 0] +
+					(double)xf[4]  * fr[n + 1] +
+					(double)xf[8]  * fr[n + 2] +
+					(double)xf[12] * fr[n + 3];
 
-		double v2 = reduce_precision<25>((double)xf[1]  * fr[n + 0]) +
-					reduce_precision<25>((double)xf[5]  * fr[n + 1]) +
-					reduce_precision<25>((double)xf[9]  * fr[n + 2]) +
-					reduce_precision<25>((double)xf[13] * fr[n + 3]);
+		double v2 = (double)xf[1]  * fr[n + 0] +
+					(double)xf[5]  * fr[n + 1] +
+					(double)xf[9]  * fr[n + 2] +
+					(double)xf[13] * fr[n + 3];
 
-		double v3 = reduce_precision<25>((double)xf[2]  * fr[n + 0]) +
-					reduce_precision<25>((double)xf[6]  * fr[n + 1]) +
-					reduce_precision<25>((double)xf[10] * fr[n + 2]) +
-					reduce_precision<25>((double)xf[14] * fr[n + 3]);
+		double v3 = (double)xf[2]  * fr[n + 0] +
+					(double)xf[6]  * fr[n + 1] +
+					(double)xf[10] * fr[n + 2] +
+					(double)xf[14] * fr[n + 3];
 
-		double v4 = reduce_precision<25>((double)xf[3]  * fr[n + 0]) +
-					reduce_precision<25>((double)xf[7]  * fr[n + 1]) +
-					reduce_precision<25>((double)xf[11] * fr[n + 2]) +
-					reduce_precision<25>((double)xf[15] * fr[n + 3]);
+		double v4 = (double)xf[3]  * fr[n + 0] +
+					(double)xf[7]  * fr[n + 1] +
+					(double)xf[11] * fr[n + 2] +
+					(double)xf[15] * fr[n + 3];
 
-		fr[n + 0] = (float)fixNaN64(v1);
-		fr[n + 1] = (float)fixNaN64(v2);
-		fr[n + 2] = (float)fixNaN64(v3);
-		fr[n + 3] = (float)fixNaN64(v4);
+		fr[n + 0] = fixNaN((float)v1);
+		fr[n + 1] = fixNaN((float)v2);
+		fr[n + 2] = fixNaN((float)v3);
+		fr[n + 3] = fixNaN((float)v4);
 #else
 		float v1, v2, v3, v4;
 
@@ -761,9 +757,7 @@ sh4op(i1111_nn01_1111_1101)
 	}
 }
 
-
-void iNimp(const char*str)
+static void iNimp(const char *str)
 {
 	WARN_LOG(INTERPRETER, "Unimplemented sh4 FPU instruction: %s", str);
-	//Sh4_int_Stop();
 }
diff --git a/core/hw/sh4/interpr/sh4_interpreter.cpp b/core/hw/sh4/interpr/sh4_interpreter.cpp
index d7fdbcd1a..3a648736f 100644
--- a/core/hw/sh4/interpr/sh4_interpreter.cpp
+++ b/core/hw/sh4/interpr/sh4_interpreter.cpp
@@ -123,13 +123,12 @@ void Sh4_int_Reset(bool hard)
 		old_sr.status=sr.status;
 		UpdateSR();
 
-		fpscr.full = 0x0004001;
+		fpscr.full = 0x00040001;
 		old_fpscr=fpscr;
 		UpdateFPSCR();
 		icache.Reset(hard);
 		ocache.Reset(hard);
 
-		//Any more registers have default value ?
 		INFO_LOG(INTERPRETER, "Sh4 Reset");
 	}
 }
diff --git a/core/hw/sh4/sh4_core.h b/core/hw/sh4/sh4_core.h
index 3e2f0af3d..f86200b86 100644
--- a/core/hw/sh4/sh4_core.h
+++ b/core/hw/sh4/sh4_core.h
@@ -160,13 +160,3 @@ static INLINE f64 fixNaN64(f64 f)
 #endif
 	return f;
 }
-
-// Reduces the precision of the argument f by a given number of bits
-// double have 53 bits of precision so the returned result will have a precision of 53 - bits
-// Note: with -ffast-math c -(c - f) is simplified to ... f, which makes this function a nop
-template<int bits>
-static INLINE double reduce_precision(double f)
-{
-	double c = (double)((1ull << bits) + 1) * f;
-	return c - (c - f);
-}
diff --git a/core/linux-dist/evdev_gamepad.h b/core/linux-dist/evdev_gamepad.h
index ebe28823f..0961a96a0 100644
--- a/core/linux-dist/evdev_gamepad.h
+++ b/core/linux-dist/evdev_gamepad.h
@@ -37,7 +37,7 @@ class EvdevGamepadDevice : public GamepadDevice
 {
 public:
 	EvdevGamepadDevice(int maple_port, const char *devnode, int fd, const char *mapping_file = NULL)
-	: GamepadDevice(maple_port, "evdev"), _fd(fd), _rumble_effect_id(-1), _devnode(devnode)
+	: GamepadDevice(maple_port, "evdev"), _fd(fd), _devnode(devnode), _rumble_effect_id(-1)
 	{
 		fcntl(fd, F_SETFL, O_NONBLOCK);
 		char buf[256] = "Unknown";
@@ -56,8 +56,6 @@ public:
 		{
 #if defined(TARGET_PANDORA)
 			mapping_file = "controller_pandora.cfg";
-#elif defined(TARGET_GCW0)
-			mapping_file = "controller_gcwz.cfg";
 #else
 			if (_name == "Microsoft X-Box 360 pad"
 				|| _name == "Xbox 360 Wireless Receiver"
diff --git a/core/rec-x64/xbyak_base.h b/core/rec-x64/xbyak_base.h
index db2a15fbe..a5d07dd39 100644
--- a/core/rec-x64/xbyak_base.h
+++ b/core/rec-x64/xbyak_base.h
@@ -609,17 +609,22 @@ protected:
 		case shop_cvt_f2i_t:
 			{
 				Xbyak::Reg32 rd = mapRegister(op.rd);
-				cvttss2si(rd, mapXRegister(op.rs1));
-				mov(eax, 0x7fffffff);
-				cmp(rd, 0x7fffff80);	// 2147483520.0f
-				cmovge(rd, eax);
-				cmp(rd, 0x80000000);	// indefinite integer
-				Xbyak::Label done;
-				jne(done, T_SHORT);
-				movd(ecx, mapXRegister(op.rs1));
-				cmp(ecx, 0);
-				cmovge(rd, eax);		// restore the correct sign
-				L(done);
+		        Xbyak::Label done;
+
+		        cvttss2si(edx, mapXRegister(op.rs1));
+		        mov(rd, 0x7fffffff);
+		        cmp(edx, 0x7fffff80);
+		        jg(done, T_SHORT);
+		        mov(rd, edx);
+		        cmp(rd, 0x80000000);	// indefinite integer
+		        jne(done, T_SHORT);
+		        xor_(eax, eax);
+		        static u32 zero;
+		        ucomiss(mapXRegister(op.rs1), dword[&zero]);
+		        setb(al);
+		        add(eax, 0x7fffffff);
+		        mov(rd, eax);
+		        L(done);
 			}
 			break;
 		case shop_cvt_i2f_n:
diff --git a/shell/android-studio/reicast/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk
deleted file mode 100644
index 0ae69f83d..000000000
--- a/shell/android-studio/reicast/src/main/jni/Android.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)/..
-
-include $(CLEAR_VARS)
-
-FOR_ANDROID := 1
-USE_GLES := 1
-CHD5_LZMA := 1
-CHD5_FLAC := 1
-USE_VULKAN = 1
-
-ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
-  NOT_ARM := 1
-else
-  NOT_ARM := 
-endif
-
-ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-#  CPP_REC := 1
-  ARM64_REC := 1
-  ISARM64 := 1
-else
-#  CPP_REC :=
-  ARM64_REC :=
-  ISARM64 :=
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-  X86_REC := 1
-else
-  X86_REC := 
-endif
-
-ifeq ($(TARGET_ARCH_ABI),mips)
-  ISMIPS := 1
-  NO_REC := 1
-else
-  ISMIPS :=
-  NO_REC :=
-endif
-
-$(info $$TARGET_ARCH_ABI is [${TARGET_ARCH_ABI}])
-
-include $(LOCAL_PATH)/../../../../../core/core.mk
-
-LOCAL_SRC_FILES := $(RZDCY_FILES)
-LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/Android.cpp)
-LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/utils.cpp)
-LOCAL_CFLAGS  := $(RZDCY_CFLAGS) -fPIC -fvisibility=hidden -ffunction-sections -fdata-sections -DVK_USE_PLATFORM_ANDROID_KHR #-DDEBUGFAST
-LOCAL_CPPFLAGS  := $(RZDCY_CXXFLAGS) -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -fexceptions
-
-# 7-Zip/LZMA settings (CHDv5)
-ifdef CHD5_LZMA
-	LOCAL_CFLAGS += -D_7ZIP_ST -DCHD5_LZMA
-endif
-
-# FLAC settings (CHDv5)
-ifdef CHD5_FLAC
-	LOCAL_CFLAGS += -DCHD5_FLAC
-endif
-
-LOCAL_CFLAGS += -DGLES3
-LOCAL_CPPFLAGS += -std=c++11 -fopenmp
-LOCAL_LDFLAGS  += -fopenmp
-
-ifeq ($(call ndk-major-at-least,21),true)
-  LOCAL_LDFLAGS += -static-openmp
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-  LOCAL_CFLAGS+= -DTARGET_NO_AREC -DTARGET_NO_OPENMP
-endif
-
-LOCAL_CPP_FEATURES := 
-# LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_PRELINK_MODULE  := false
-
-LOCAL_MODULE	:= flycast
-LOCAL_DISABLE_FORMAT_STRING_CHECKS=true
-LOCAL_ASFLAGS := -fPIC -fvisibility=hidden
-LOCAL_LDLIBS	:= -llog -lEGL -lz -landroid
-#-Wl,-Map,./res/raw/syms.mp3
-LOCAL_ARM_MODE	:= arm
-
-ifeq ($(TARGET_ARCH_ABI),mips)
-  LOCAL_LDFLAGS += -Wl,--gc-sections
-else
-  ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-    LOCAL_LDFLAGS += -Wl,--gc-sections
-  else
-    LOCAL_LDFLAGS += -Wl,--gc-sections,--icf=safe
-    LOCAL_LDLIBS +=  -Wl,--no-warn-shared-textrel
-  endif
-endif
-
-$(LOCAL_SRC_FILES): $(VERSION_HEADER)
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/shell/android-studio/reicast/src/main/jni/Application.mk b/shell/android-studio/reicast/src/main/jni/Application.mk
deleted file mode 100644
index 6aab8e618..000000000
--- a/shell/android-studio/reicast/src/main/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := armeabi-v7a arm64-v8a
-APP_STL := c++_static
diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index 553517f49..3d4a52fc2 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -98,8 +98,6 @@ ifeq (,$(platform))
         else
             platform = armv7h
         endif
-    else ifneq (,$(findstring mips,$(ARCH)))
-        platform = gcwz
     else
         $(warning Unsupported CPU architecture, using lincpp)
         platform = lincpp
@@ -260,16 +258,6 @@ else ifneq (,$(findstring rockchip,$(platform)))
     FOR_LINUX := 1
     ISARM64 := 1
 
-# GCW Zero
-else ifneq (,$(findstring gcwz,$(platform)))
-    NOT_ARM := 1
-    NO_REC := 1
-    CC_PREFIX ?= /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-
-    CFLAGS += -D TARGET_GCW0 -D TARGET_NO_REC -fsingle-precision-constant
-    LIBS += -L./gcwz/enta_viv -lglapi
-    GCWZ_PKG = reicast-gcwz.opk
-    GCWZ_PKG_FILES = gcwz/default.gcw0.desktop gcwz/icon-32.png
-
 # Vero4K
 else ifneq (,$(findstring vero4k,$(platform)))
     MFLAGS += -marm -march=armv8-a+crc -mtune=cortex-a53 -mfloat-abi=hard -funsafe-math-optimizations -funroll-loops
@@ -321,7 +309,7 @@ LDFLAGS += -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common
 
 CFLAGS += $(RZDCY_CFLAGS) -g -O3 -D NDEBUG -c -fopenmp #-D NO_REND
 CFLAGS += -frename-registers -fno-strict-aliasing
-CFLAGS += -ffast-math -ftree-vectorize -Wall -Wno-unused-result
+CFLAGS += -ftree-vectorize -Wall -Wno-unused-result
 
 CXXFLAGS += $(RZDCY_CFLAGS) -fno-rtti -fno-operator-names -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11
 
@@ -537,9 +525,6 @@ DEPS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(DEPDIR)/%,$(DEPS))
 POSTCOMPILE = mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
 
 all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED)
-ifneq (,$(findstring gcwz,$(platform)))
-	mksquashfs $(EXECUTABLE_STRIPPED) $(GCWZ_PKG_FILES) $(GCWZ_PKG) -all-root
-endif
 
 $(EXECUTABLE): $(OBJECTS)
 	$(CXX) $(MFLAGS) $(EXTRAFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
@@ -579,7 +564,6 @@ install: $(EXECUTABLE)
 	mkdir -p $(DESTDIR)$(MENUENTRY_DIR) 2>/dev/null || true
 	mkdir -p $(DESTDIR)$(ICON_DIR) 2>/dev/null || true
 	install -m755 $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
-	install -m644 mappings/controller_gcwz.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
 	install -m644 mappings/controller_generic.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
 	install -m644 mappings/controller_pandora.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
 	install -m644 mappings/controller_xboxdrv.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
@@ -591,7 +575,6 @@ install: $(EXECUTABLE)
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_gcwz.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_generic.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_pandora.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_xboxdrv.cfg
diff --git a/shell/linux/gcwz/default.gcw0.desktop b/shell/linux/gcwz/default.gcw0.desktop
deleted file mode 100644
index dc700d237..000000000
--- a/shell/linux/gcwz/default.gcw0.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=reicast
-Comment=A Sega Dreamcast emulator
-Exec=nosym-reicast.elf
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=icon-32
-Categories=emulators;
diff --git a/shell/linux/gcwz/enta_viv/libEGL.so b/shell/linux/gcwz/enta_viv/libEGL.so
deleted file mode 100644
index 6d7249493..000000000
Binary files a/shell/linux/gcwz/enta_viv/libEGL.so and /dev/null differ
diff --git a/shell/linux/gcwz/enta_viv/libGLESv2.so b/shell/linux/gcwz/enta_viv/libGLESv2.so
deleted file mode 100644
index 4fa829c16..000000000
Binary files a/shell/linux/gcwz/enta_viv/libGLESv2.so and /dev/null differ
diff --git a/shell/linux/gcwz/enta_viv/libdrm.so b/shell/linux/gcwz/enta_viv/libdrm.so
deleted file mode 100644
index 2922b4529..000000000
Binary files a/shell/linux/gcwz/enta_viv/libdrm.so and /dev/null differ
diff --git a/shell/linux/gcwz/enta_viv/libglapi.so b/shell/linux/gcwz/enta_viv/libglapi.so
deleted file mode 100644
index c6381bf8a..000000000
Binary files a/shell/linux/gcwz/enta_viv/libglapi.so and /dev/null differ
diff --git a/shell/linux/gcwz/icon-32.png b/shell/linux/gcwz/icon-32.png
deleted file mode 100644
index 7e745d6e9..000000000
Binary files a/shell/linux/gcwz/icon-32.png and /dev/null differ
diff --git a/shell/linux/mappings/controller_gcwz.cfg b/shell/linux/mappings/controller_gcwz.cfg
deleted file mode 100644
index 8ab28b00f..000000000
--- a/shell/linux/mappings/controller_gcwz.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[emulator]
-mapping_name = GCW Zero
-btn_escape = 0x01
-
-[dreamcast]
-btn_a = 0x1D
-btn_b = 0x38
-btn_c = 0x0F
-btn_d = 0x0E
-btn_x = 0x2A
-btn_y = 0x39
-btn_start = 0x1C
-btn_dpad1_left = 0x69
-btn_dpad1_right = 0x6A
-btn_dpad1_up = 0x67
-btn_dpad1_down = 0x6C