diff --git a/Dockerfile b/Dockerfile
index 51c926597..c23df2fbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ RUN apt install -y ffmpeg
 RUN apt install -y postgresql
 RUN apt install -y libpq-dev
 RUN apt install -y nano
-RUN apt install -y exiv2
 
 COPY requirements.txt /etc/requirements.txt
 
diff --git a/files/helpers/media.py b/files/helpers/media.py
index 3ea963610..06c51842b 100644
--- a/files/helpers/media.py
+++ b/files/helpers/media.py
@@ -140,8 +140,7 @@ def process_image(filename:str, v, resize=0, trim=False, uploader_id:Optional[in
 
 	try:
 		with Image.open(filename) as i:
-			params = ["magick", filename]
-			params.extend(["-coalesce", "-quality", "88"])
+			params = ["magick", filename, filename, "-coalesce", "-strip", "-auto-orient", "-quality", "88"]
 			if trim and len(list(Iterator(i))) == 1:
 				params.append("-trim")
 			if resize and i.width > resize:
@@ -155,17 +154,13 @@ def process_image(filename:str, v, resize=0, trim=False, uploader_id:Optional[in
 			abort(415)
 		return None
 
-	if len(params) > 2:
-		params.extend(["-strip", "-auto-orient", filename])
-		try:
-			subprocess.run(params, timeout=MAX_IMAGE_CONVERSION_TIMEOUT)
-		except subprocess.TimeoutExpired:
-			if has_request:
-				abort(413, ("An uploaded image took too long to convert to WEBP. "
-							"Please convert it to WEBP elsewhere then upload it again."))
-			return None
-	else:
-		subprocess.run(["exiv2", "rm", filename], timeout=MAX_IMAGE_CONVERSION_TIMEOUT)
+	try:
+		subprocess.run(params, timeout=MAX_IMAGE_CONVERSION_TIMEOUT)
+	except subprocess.TimeoutExpired:
+		if has_request:
+			abort(413, ("An uploaded image took too long to convert to WEBP. "
+						"Please convert it to WEBP elsewhere then upload it again."))
+		return None
 
 	if resize:
 		if os.stat(filename).st_size > MAX_IMAGE_SIZE_BANNER_RESIZED_MB * 1024 * 1024:
diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh
index 90dead8d7..baab61734 100644
--- a/ubuntu_setup.sh
+++ b/ubuntu_setup.sh
@@ -1,6 +1,6 @@
 apt -y update
 apt -y upgrade
-apt -y install git redis-server python3-pip ffmpeg tmux nginx snapd ufw gpg-agent htop nano exiv2
+apt -y install git redis-server python3-pip ffmpeg tmux nginx snapd ufw gpg-agent htop nano
 
 git config --global credential.helper store
 cd /rDrama