diff --git a/play.pokemonshowdown.com/fx/client-bg-waterfall.jpg b/play.pokemonshowdown.com/fx/client-bg-waterfall.jpg
deleted file mode 100644
index fd1961f99..000000000
Binary files a/play.pokemonshowdown.com/fx/client-bg-waterfall.jpg and /dev/null differ
diff --git a/play.pokemonshowdown.com/js/client-topbar.js b/play.pokemonshowdown.com/js/client-topbar.js
index ae8f5f5e2..ba6cae451 100644
--- a/play.pokemonshowdown.com/js/client-topbar.js
+++ b/play.pokemonshowdown.com/js/client-topbar.js
@@ -839,7 +839,6 @@
 
 			buf += '<button name="setBg" value="charizards" class="option' + (cur === 'charizards' ? ' cur' : '') + '"><span class="bg" style="background-position:0 -' + (90 * 0) + 'px"></span>Charizards</button>';
 			buf += '<button name="setBg" value="horizon" class="option' + (cur === 'horizon' ? ' cur' : '') + '"><span class="bg" style="background-position:0 -' + (90 * 1) + 'px"></span>Horizon</button>';
-			buf += '<button name="setBg" value="waterfall" class="option' + (cur === 'waterfall' ? ' cur' : '') + '"><span class="bg" style="background-position:0 -' + (90 * 2) + 'px"></span>Waterfall</button>';
 			buf += '<button name="setBg" value="ocean" class="option' + (cur === 'ocean' ? ' cur' : '') + '"><span class="bg" style="background-position:0 -' + (90 * 3) + 'px"></span>Ocean</button>';
 			buf += '<button name="setBg" value="shaymin" class="option' + (cur === 'shaymin' ? ' cur' : '') + '"><span class="bg" style="background-position:0 -' + (90 * 4) + 'px"></span>Shaymin</button>';
 			buf += '<button name="setBg" value="solidblue" class="option' + (cur === 'solidblue' ? ' cur' : '') + '"><span class="bg" style="background: #344b6c"></span>Solid blue</button>';
diff --git a/play.pokemonshowdown.com/js/storage.js b/play.pokemonshowdown.com/js/storage.js
index cf1c0f27b..c3f221c2c 100644
--- a/play.pokemonshowdown.com/js/storage.js
+++ b/play.pokemonshowdown.com/js/storage.js
@@ -55,8 +55,9 @@ Storage.bg = {
 		if (!bgid) {
 			if (location.host === 'smogtours.psim.us') {
 				bgid = 'shaymin';
-			} else if (location.host === Config.routes.client) {
-				bgid = ['horizon', 'ocean', 'waterfall', 'shaymin', 'charizards', 'psday'][Math.floor(Math.random() * 6)];
+			} else if (location.host === Config.routes.client || bgid === 'waterfall') {
+				var bgs = ['horizon', 'ocean', 'shaymin', 'charizards', 'psday'];
+				bgid = bgs[Math.floor(Math.random() * bgs.length)];
 			} else {
 				$(document.body).css({
 					background: '',
@@ -97,10 +98,6 @@ Storage.bg = {
 				hues = ["82.8169014084507,34.63414634146342%", "216.16438356164383,29.55465587044534%", "212.92682926829266,59.42028985507245%", "209.18918918918916,57.51295336787566%", "199.2857142857143,48.275862068965495%", "213.11999999999998,55.06607929515419%"];
 				attrib = '<a href="https://quanyails.deviantart.com/art/Sunrise-Ocean-402667154" target="_blank" class="subtle">"Sunrise Ocean" <small>background by Quanyails</small></a>';
 				break;
-			case 'waterfall':
-				hues = ["119.31034482758622,37.66233766233767%", "184.36363636363635,23.012552301255226%", "108.92307692307692,37.14285714285714%", "70.34482758620689,20.567375886524818%", "98.39999999999998,36.76470588235296%", "140,38.18181818181818%"];
-				attrib = '<a href="https://x.com/Yilxaevum" target="_blank" class="subtle">"Irie" <small>background by Samuel Teo</small></a>';
-				break;
 			case 'shaymin':
 				hues = ["39.000000000000064,21.7391304347826%", "170.00000000000003,2.380952380952378%", "157.5,11.88118811881188%", "174.78260869565216,12.041884816753928%", "185.00000000000003,12.76595744680851%", "20,5.660377358490567%"];
 				attrib = '<a href="http://cargocollective.com/bluep" target="_blank" class="subtle">"Shaymin" <small>background by Daniel Kong</small></a>';
diff --git a/play.pokemonshowdown.com/src/client-core.ts b/play.pokemonshowdown.com/src/client-core.ts
index 818408f4e..d46e8cb3d 100644
--- a/play.pokemonshowdown.com/src/client-core.ts
+++ b/play.pokemonshowdown.com/src/client-core.ts
@@ -159,14 +159,14 @@ export const PSBackground = new class extends PSStreamModel<string | null> {
 		this.id = bgid;
 
 		// curid
-		if (!bgid) {
+		if (!bgid || bgid === 'waterfall') {
 			if (location.host === 'smogtours.psim.us') {
 				bgid = 'shaymin';
 			} else {
-				const bgs = ['horizon', 'ocean', 'waterfall', 'shaymin', 'charizards'];
-				bgid = bgs[Math.floor(Math.random() * 5)];
+				const bgs = ['horizon', 'ocean', 'shaymin', 'charizards'];
+				bgid = bgs[Math.floor(Math.random() * bgs.length)];
 				// if someone clicked the random button, try to roll a different bg than before
-				if (bgid === this.curId) bgid = bgs[Math.floor(Math.random() * 5)];
+				if (bgid === this.curId) bgid = bgs[Math.floor(Math.random() * bgs.length)];
 			}
 		}
 		this.curId = bgid;
@@ -214,21 +214,6 @@ export const PSBackground = new class extends PSStreamModel<string | null> {
 				artist: 'Quanyails',
 			};
 			break;
-		case 'waterfall':
-			menuColors = [
-				"119.31034482758622,37.66233766233767%",
-				"184.36363636363635,23.012552301255226%",
-				"108.92307692307692,37.14285714285714%",
-				"70.34482758620689,20.567375886524818%",
-				"98.39999999999998,36.76470588235296%",
-				"140,38.18181818181818%",
-			];
-			attrib = {
-				url: 'https://x.com/Yilxaevum',
-				title: 'Irie',
-				artist: 'Samuel Teo',
-			};
-			break;
 		case 'shaymin':
 			menuColors = [
 				"39.000000000000064,21.7391304347826%",
diff --git a/play.pokemonshowdown.com/src/panel-popups.tsx b/play.pokemonshowdown.com/src/panel-popups.tsx
index b6f171675..c5ad0c9a0 100644
--- a/play.pokemonshowdown.com/src/panel-popups.tsx
+++ b/play.pokemonshowdown.com/src/panel-popups.tsx
@@ -1354,10 +1354,6 @@ class BackgroundListPanel extends PSRoomPanel {
 					<span class="bg" style="background-position: 0 -90px"></span>{}
 					Horizon
 				</button>
-				<button onClick={this.setBg} value="waterfall" class={option('waterfall')}>
-					<span class="bg" style="background-position: 0 -180px"></span>{}
-					Waterfall
-				</button>
 				<button onClick={this.setBg} value="ocean" class={option('ocean')}>
 					<span class="bg" style="background-position: 0 -270px"></span>{}
 					Ocean
diff --git a/pokemonshowdown.com/credits.php b/pokemonshowdown.com/credits.php
index e7bca78f5..4f3aad63d 100644
--- a/pokemonshowdown.com/credits.php
+++ b/pokemonshowdown.com/credits.php
@@ -136,7 +136,6 @@ includeHeader();
 				<li><p><a href="https://lit.link/en/seiryuuden" target="_blank" class="subtle"><strong>Jessica Valencia</strong> [seiryuuden]</a> <small>&ndash; Art (Charizards background)</small></p></li>
 				<li><p><a href="http://kyle-dove.deviantart.com/" target="_blank" class="subtle"><strong>Kyle Dove</strong></a> <small>&ndash; Art (battle backdrops)</small></p></li>
 				<li><p><a href="http://vtas.deviantart.com/" target="_blank" class="subtle"><strong>Vivian Zou</strong> [Vtas]</a> <small>&ndash; Art (Horizon background)</small></p></li>
-				<li><p><a href="https://x.com/Yilxaevum" target="_blank" class="subtle"><strong>Samuel Teo</strong> [Yilx]</a> <small>&ndash; Art (Waterfall background)</small></p></li>
 				<li><p><a href="http://quanyails.deviantart.com/" target="_blank" class="subtle">[<strong>Quanyails</strong>]</a> <small>&ndash; Art (Ocean background)</small></p></li>
 				<li><p><a href="http://smogon.com/forums/threads/3486712/" target="_blank" class="subtle"><strong>X/Y</strong></a> and <a href="http://www.smogon.com/forums/threads/3577711/" target="_blank" class="subtle"><strong>Sun/Moon Sprite Projects</strong></a> led by <strong>Ian Clail</strong> [Layell]<small>&ndash; Sprites</small></p></li>
 				<li><p><a href="http://www.smogon.com/forums/threads/3577711/" target="_blank" class="subtle"><strong>Sun/Moon</strong></a> and <a href="https://www.smogon.com/forums/threads/3647722/" target="_blank" class="subtle"><strong>Sword/Shield Sprite Projects</strong></a> led by [<strong>leparagon</strong>] <small>&ndash; Sprites</small></p></li>