diff --git a/include/common.h b/include/common.h
index 3cc9b8a..00d28fa 100644
--- a/include/common.h
+++ b/include/common.h
@@ -34,7 +34,7 @@ struct nvnc_client {
 	struct uv_tcp_s stream_handle;
 	struct nvnc* server;
 	enum nvnc_client_state state;
-	uint32_t fourcc;
+	bool has_pixfmt;
 	struct rfb_pixel_format pixfmt;
 	enum rfb_encodings encodings[MAX_ENCODINGS + 1];
 	size_t n_encodings;
diff --git a/src/pixels.c b/src/pixels.c
index 1205bfa..c66839c 100644
--- a/src/pixels.c
+++ b/src/pixels.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Andri Yngvason
+ * Copyright (c) 2019 - 2020 Andri Yngvason
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -220,90 +220,3 @@ bpp_16:
 
 	return 0;
 };
-
-static int max_values_to_depth(int r, int g, int b)
-{
-	if (r ==    5 && g ==    5 && b ==    3) return  8;
-	if (r ==   15 && g ==   15 && b ==   15) return 12;
-	if (r ==   31 && g ==   31 && b ==   31) return 15;
-	if (r ==   31 && g ==  127 && b ==   31) return 16;
-	if (r ==  255 && g ==  255 && b ==  255) return 24;
-	if (r == 1023 && g == 1023 && b == 1023) return 30;
-	return -1;
-}
-
-static uint32_t shift_values_to_fourcc(int r, int g, int b, int bpp)
-{
-#define RGBEQ(rv, gv, bv) (r == (rv) && g == (gv) && b == (bv))
-	if (bpp == 32 && RGBEQ(24, 16,  8)) return DRM_FORMAT_RGBX8888;
-	if (bpp == 32 && RGBEQ( 8, 16, 24)) return DRM_FORMAT_BGRX8888;
-	if (bpp == 32 && RGBEQ(16,  8,  0)) return DRM_FORMAT_XRGB8888;
-	if (bpp == 32 && RGBEQ( 0,  8, 16)) return DRM_FORMAT_XBGR8888;
-
-	if (bpp == 32 && RGBEQ(22, 12,  2)) return DRM_FORMAT_RGBX1010102;
-	if (bpp == 32 && RGBEQ( 2, 12, 22)) return DRM_FORMAT_BGRX1010102;
-	if (bpp == 32 && RGBEQ(20, 10,  0)) return DRM_FORMAT_XRGB2101010;
-	if (bpp == 32 && RGBEQ( 0, 10, 20)) return DRM_FORMAT_XBGR2101010;
-
-	if (bpp == 24 && RGBEQ( 0,  8, 16)) return DRM_FORMAT_BGR888;
-	if (bpp == 24 && RGBEQ(16,  8,  0)) return DRM_FORMAT_RGB888;
-
-	if (bpp == 16 && RGBEQ(12,  8,  4)) return DRM_FORMAT_RGBX4444;
-	if (bpp == 16 && RGBEQ( 4,  8, 12)) return DRM_FORMAT_BGRX4444;
-	if (bpp == 16 && RGBEQ( 8,  4,  0)) return DRM_FORMAT_XRGB4444;
-	if (bpp == 16 && RGBEQ( 0,  4,  8)) return DRM_FORMAT_XBGR4444;
-
-	if (bpp == 16 && RGBEQ(11,  6,  1)) return DRM_FORMAT_RGBX5551;
-	if (bpp == 16 && RGBEQ( 1,  6, 11)) return DRM_FORMAT_BGRX5551;
-	if (bpp == 16 && RGBEQ(15,  5,  0)) return DRM_FORMAT_XRGB1555;
-	if (bpp == 16 && RGBEQ( 0,  5, 15)) return DRM_FORMAT_XBGR1555;
-
-	if (bpp == 16 && RGBEQ(11,  5,  0)) return DRM_FORMAT_RGB565;
-	if (bpp == 16 && RGBEQ( 0,  5, 11)) return DRM_FORMAT_BGR565;
-
-	if (bpp ==  8 && RGBEQ( 5,  2,  0)) return DRM_FORMAT_RGB332;
-	if (bpp ==  8 && RGBEQ( 0,  2,  5)) return DRM_FORMAT_BGR233;
-
-	return DRM_FORMAT_INVALID;
-#undef RGBEQ
-}
-/* clang-format on */
-
-int get_fourcc_depth(uint32_t fourcc)
-{
-	switch (fourcc) {
-	case DRM_FORMAT_RGB332:
-	case DRM_FORMAT_BGR233:
-		return 8;
-	default:
-		return (((fourcc >> 24) & 0xff) - '0') +
-		       (((fourcc >> 16) & 0xff) - '0') * 10;
-	}
-}
-
-uint32_t rfb_pixfmt_to_fourcc(const struct rfb_pixel_format* fmt)
-{
-	if (!fmt->true_colour_flag)
-		return DRM_FORMAT_INVALID;
-
-	/* Note: The depth value given by the client is ignored */
-	int depth =
-	        max_values_to_depth(fmt->red_max, fmt->green_max, fmt->blue_max);
-	if (depth < 0)
-		return DRM_FORMAT_INVALID;
-
-	uint32_t fourcc =
-	        shift_values_to_fourcc(fmt->red_shift, fmt->green_shift,
-	                               fmt->blue_shift, fmt->bits_per_pixel);
-
-	if (fourcc == DRM_FORMAT_INVALID)
-		return DRM_FORMAT_INVALID;
-
-	if (get_fourcc_depth(fourcc) != depth)
-		return DRM_FORMAT_INVALID;
-
-	fourcc |= fmt->big_endian_flag ? DRM_FORMAT_BIG_ENDIAN : 0;
-
-	return fourcc;
-}
-
diff --git a/src/server.c b/src/server.c
index c64e6ba..413657c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -298,7 +298,7 @@ static int on_client_set_pixel_format(struct nvnc_client* client)
 
 	memcpy(&client->pixfmt, fmt, sizeof(client->pixfmt));
 
-	client->fourcc = rfb_pixfmt_to_fourcc(fmt);
+	client->has_pixfmt = true;
 
 	return 4 + sizeof(struct rfb_pixel_format);
 }
@@ -694,9 +694,9 @@ void do_client_update_fb(uv_work_t* work)
 		return;
 	}
 
-	if (client->fourcc == DRM_FORMAT_INVALID) {
+	if (!client->has_pixfmt) {
 		rfb_pixfmt_from_fourcc(&client->pixfmt, fb->fourcc_format);
-		client->fourcc = fb->fourcc_format;
+		client->has_pixfmt = true;
 	}
 
 	switch (encoding) {