diff --git a/src/swrenderer/plane/r_visibleplane.cpp b/src/swrenderer/plane/r_visibleplane.cpp
index a1d7dc8dd..755af3461 100644
--- a/src/swrenderer/plane/r_visibleplane.cpp
+++ b/src/swrenderer/plane/r_visibleplane.cpp
@@ -43,6 +43,18 @@ CVAR(Bool, tilt, false, 0);
 
 namespace swrenderer
 {
+	visplane_t::visplane_t()
+	{
+		picnum.SetNull();
+		height.set(0.0, 0.0, 1.0, 0.0);
+
+		bottom = RenderMemory::AllocMemory<uint16_t>(viewwidth);
+		top = RenderMemory::AllocMemory<uint16_t>(viewwidth);
+
+		fillshort(bottom, viewwidth, 0);
+		fillshort(top, viewwidth, 0x7fff);
+	}
+
 	void visplane_t::AddLights(FLightNode *node)
 	{
 		if (!r_dynlights)
diff --git a/src/swrenderer/plane/r_visibleplane.h b/src/swrenderer/plane/r_visibleplane.h
index f905a4758..6c06fc802 100644
--- a/src/swrenderer/plane/r_visibleplane.h
+++ b/src/swrenderer/plane/r_visibleplane.h
@@ -15,6 +15,8 @@
 
 #include <stddef.h>
 #include "r_defs.h"
+#include "r_state.h"
+#include "swrenderer/r_memory.h"
 
 class ADynamicLight;
 struct FLightNode;
@@ -31,40 +33,42 @@ namespace swrenderer
 
 	struct visplane_t
 	{
-		visplane_t *next;		// Next visplane in hash chain -- killough
+		visplane_t();
 
-		FDynamicColormap *colormap;		// [RH] Support multiple colormaps
-		FSectorPortal *portal;			// [RH] Support sky boxes
-		visplane_light *lights;
+		void AddLights(FLightNode *node);
+		void Render(fixed_t alpha, bool additive, bool masked);
+
+		visplane_t *next = nullptr;		// Next visplane in hash chain -- killough
+
+		FDynamicColormap *colormap = nullptr;		// [RH] Support multiple colormaps
+		FSectorPortal *portal = nullptr;			// [RH] Support sky boxes
+		visplane_light *lights = nullptr;
 
 		FTransform	xform;
 		secplane_t	height;
 		FTextureID	picnum;
-		int			lightlevel;
-		int			left, right;
-		int			sky;
+		int lightlevel = 0;
+		int left = viewwidth;
+		int right = 0;
+		int sky = 0;
 
 		// [RH] This set of variables copies information from the time when the
 		// visplane is created. They are only used by stacks so that you can
 		// have stacked sectors inside a skybox. If the visplane is not for a
 		// stack, then they are unused.
-		int			extralight;
-		double		visibility;
-		DVector3	viewpos;
-		DAngle		viewangle;
-		fixed_t		Alpha;
-		bool		Additive;
+		int			extralight = 0;
+		double		visibility = 0.0;
+		DVector3	viewpos = { 0.0, 0.0, 0.0 };
+		DAngle		viewangle = { 0.0 };
+		fixed_t		Alpha = 0;
+		bool		Additive = false;
 
 		// kg3D - keep track of mirror and skybox owner
-		int CurrentSkybox;
-		int CurrentPortalUniq; // mirror counter, counts all of them
-		int MirrorFlags; // this is not related to CurrentMirror
+		int CurrentSkybox = 0;
+		int CurrentPortalUniq = 0; // mirror counter, counts all of them
+		int MirrorFlags = 0; // this is not related to CurrentMirror
 
-		unsigned short *bottom;			// [RH] bottom and top arrays are dynamically
-		unsigned short pad;				//		allocated immediately after the
-		unsigned short top[];			//		visplane.
-
-		void AddLights(FLightNode *node);
-		void Render(fixed_t alpha, bool additive, bool masked);
+		uint16_t *bottom = nullptr;
+		uint16_t *top = nullptr;
 	};
 }
diff --git a/src/swrenderer/plane/r_visibleplanelist.cpp b/src/swrenderer/plane/r_visibleplanelist.cpp
index 7cdfdc425..b6e6de1cb 100644
--- a/src/swrenderer/plane/r_visibleplanelist.cpp
+++ b/src/swrenderer/plane/r_visibleplanelist.cpp
@@ -54,87 +54,22 @@ namespace swrenderer
 	{
 		for (auto &plane : visplanes)
 			plane = nullptr;
-		freehead = &freetail;
-	}
-
-	void VisiblePlaneList::Deinit()
-	{
-		// do not use R_ClearPlanes because at this point the screen pointer is no longer valid.
-		for (int i = 0; i <= MAXVISPLANES; i++)	// new code -- killough
-		{
-			for (*freehead = visplanes[i], visplanes[i] = nullptr; *freehead; )
-			{
-				freehead = &(*freehead)->next;
-			}
-		}
-		for (visplane_t *pl = freetail; pl != nullptr; )
-		{
-			visplane_t *next = pl->next;
-			free(pl);
-			pl = next;
-		}
 	}
 
 	visplane_t *VisiblePlaneList::Add(unsigned hash)
 	{
-		visplane_t *check = freetail;
-
-		if (check == nullptr)
-		{
-			check = (visplane_t *)M_Malloc(sizeof(*check) + 3 + sizeof(*check->top)*(MAXWIDTH * 2));
-			memset(check, 0, sizeof(*check) + 3 + sizeof(*check->top)*(MAXWIDTH * 2));
-			check->bottom = check->top + MAXWIDTH + 2;
-		}
-		else if (nullptr == (freetail = freetail->next))
-		{
-			freehead = &freetail;
-		}
-
-		check->lights = nullptr;
-
-		check->next = visplanes[hash];
-		visplanes[hash] = check;
-		return check;
-	}
-
-	void VisiblePlaneList::Init()
-	{
-		int i;
-		visplane_t *pl;
-
-		// Free all visplanes and let them be re-allocated as needed.
-		pl = freetail;
-
-		while (pl)
-		{
-			visplane_t *next = pl->next;
-			M_Free(pl);
-			pl = next;
-		}
-		freetail = nullptr;
-		freehead = &freetail;
-
-		for (i = 0; i < MAXVISPLANES; i++)
-		{
-			pl = visplanes[i];
-			visplanes[i] = nullptr;
-			while (pl)
-			{
-				visplane_t *next = pl->next;
-				M_Free(pl);
-				pl = next;
-			}
-		}
+		visplane_t *newplane = RenderMemory::NewObject<visplane_t>();
+		newplane->next = visplanes[hash];
+		visplanes[hash] = newplane;
+		return newplane;
 	}
 
 	void VisiblePlaneList::Clear(bool fullclear)
 	{
-		int i;
-
 		// Don't clear fake planes if not doing a full clear.
 		if (!fullclear)
 		{
-			for (i = 0; i <= MAXVISPLANES - 1; i++)	// new code -- killough
+			for (int i = 0; i <= MAXVISPLANES - 1; i++)
 			{
 				for (visplane_t **probe = &visplanes[i]; *probe != nullptr; )
 				{
@@ -143,25 +78,18 @@ namespace swrenderer
 						probe = &(*probe)->next;
 					}
 					else
-					{ // not fake: move to freelist
+					{ // not fake: move from list
 						visplane_t *vis = *probe;
-						*freehead = vis;
 						*probe = vis->next;
 						vis->next = nullptr;
-						freehead = &vis->next;
 					}
 				}
 			}
 		}
 		else
 		{
-			for (i = 0; i <= MAXVISPLANES; i++)	// new code -- killough
-			{
-				for (*freehead = visplanes[i], visplanes[i] = nullptr; *freehead; )
-				{
-					freehead = &(*freehead)->next;
-				}
-			}
+			for (int i = 0; i <= MAXVISPLANES; i++)
+				visplanes[i] = nullptr;
 		}
 	}
 
@@ -282,8 +210,6 @@ namespace swrenderer
 		check->colormap = basecolormap;		// [RH] Save colormap
 		check->sky = sky;
 		check->portal = portal;
-		check->left = viewwidth;			// Was SCREENWIDTH -- killough 11/98
-		check->right = 0;
 		check->extralight = renderportal->stacked_extralight;
 		check->visibility = renderportal->stacked_visibility;
 		check->viewpos = renderportal->stacked_viewpos;
@@ -294,8 +220,6 @@ namespace swrenderer
 		check->MirrorFlags = renderportal->MirrorFlags;
 		check->CurrentSkybox = Clip3DFloors::Instance()->CurrentSkybox;
 
-		fillshort(check->top, viewwidth, 0x7fff);
-
 		return check;
 	}
 
@@ -330,8 +254,8 @@ namespace swrenderer
 			intrh = stop;
 		}
 
-		for (x = intrl; x < intrh && pl->top[x] == 0x7fff; x++)
-			;
+		x = intrl;
+		while (x < intrh && pl->top[x] == 0x7fff) x++;
 
 		if (x >= intrh)
 		{
@@ -374,7 +298,6 @@ namespace swrenderer
 			pl = new_pl;
 			pl->left = start;
 			pl->right = stop;
-			fillshort(pl->top, viewwidth, 0x7fff);
 		}
 		return pl;
 	}
diff --git a/src/swrenderer/plane/r_visibleplanelist.h b/src/swrenderer/plane/r_visibleplanelist.h
index a38fe2ffd..46197c99c 100644
--- a/src/swrenderer/plane/r_visibleplanelist.h
+++ b/src/swrenderer/plane/r_visibleplanelist.h
@@ -27,8 +27,6 @@ namespace swrenderer
 	public:
 		static VisiblePlaneList *Instance();
 
-		void Init();
-		void Deinit();
 		void Clear(bool fullclear);
 
 		visplane_t *FindPlane(const secplane_t &height, FTextureID picnum, int lightlevel, double Alpha, bool additive, const FTransform &xxform, int sky, FSectorPortal *portal, FDynamicColormap *basecolormap);
@@ -39,8 +37,6 @@ namespace swrenderer
 
 		enum { MAXVISPLANES = 128 }; // must be a power of 2
 		visplane_t *visplanes[MAXVISPLANES + 1];
-		visplane_t *freetail = nullptr;
-		visplane_t **freehead = nullptr;
 
 	private:
 		VisiblePlaneList();
diff --git a/src/swrenderer/scene/r_portal.cpp b/src/swrenderer/scene/r_portal.cpp
index 2ab01b0bb..0111d74be 100644
--- a/src/swrenderer/scene/r_portal.cpp
+++ b/src/swrenderer/scene/r_portal.cpp
@@ -123,8 +123,6 @@ namespace swrenderer
 			if (pl->right < pl->left || !r_skyboxes || numskyboxes == MAX_SKYBOX_PLANES || pl->portal == nullptr)
 			{
 				pl->Render(OPAQUE, false, false);
-				*planes->freehead = pl;
-				planes->freehead = &pl->next;
 				continue;
 			}
 
@@ -164,8 +162,6 @@ namespace swrenderer
 
 			default:
 				pl->Render(OPAQUE, false, false);
-				*planes->freehead = pl;
-				planes->freehead = &pl->next;
 				numskyboxes--;
 				continue;
 			}
@@ -262,8 +258,6 @@ namespace swrenderer
 			{
 				pl->Render(pl->Alpha, pl->Additive, true);
 			}
-			*planes->freehead = pl;
-			planes->freehead = &pl->next;
 		}
 		firstdrawseg = drawsegs;
 		ds_p = drawsegs + savedds_p;
@@ -283,8 +277,7 @@ namespace swrenderer
 
 		if (Clip3DFloors::Instance()->fakeActive) return;
 
-		for (*planes->freehead = planes->visplanes[VisiblePlaneList::MAXVISPLANES], planes->visplanes[VisiblePlaneList::MAXVISPLANES] = nullptr; *planes->freehead; )
-			planes->freehead = &(*planes->freehead)->next;
+		planes->visplanes[VisiblePlaneList::MAXVISPLANES] = nullptr;
 	}
 
 	void RenderPortal::RenderLinePortals()
diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp
index dfbf63a96..451bd6498 100644
--- a/src/swrenderer/scene/r_scene.cpp
+++ b/src/swrenderer/scene/r_scene.cpp
@@ -246,8 +246,6 @@ namespace swrenderer
 
 	void RenderScene::ScreenResized()
 	{
-		VisiblePlaneList::Instance()->Init();
-
 		RenderTarget = screen;
 		int width = SCREENWIDTH;
 		int height = SCREENHEIGHT;
@@ -271,7 +269,6 @@ namespace swrenderer
 	void RenderScene::Deinit()
 	{
 		RenderTranslucentPass::Deinit();
-		VisiblePlaneList::Instance()->Deinit();
 		Clip3DFloors::Instance()->Cleanup();
 		R_FreeDrawSegs();
 	}