diff --git a/Minecraft.Client/CreateWorldScreen.cpp b/Minecraft.Client/CreateWorldScreen.cpp
index df0130bb..0955fcf2 100644
--- a/Minecraft.Client/CreateWorldScreen.cpp
+++ b/Minecraft.Client/CreateWorldScreen.cpp
@@ -96,7 +96,8 @@ void CreateWorldScreen::buttonClicked(Button *button)
         if (done) return;
         done = true;
 
-        int64_t seedValue = (new Random())->nextLong();
+        Random tempRandom;
+        int64_t seedValue = tempRandom.nextLong();
         wstring seedString = seedEdit->getValue();
 
 		if (seedString.length() != 0)
diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp
index b5e9b0ad..01ef7d2e 100644
--- a/Minecraft.Client/GameRenderer.cpp
+++ b/Minecraft.Client/GameRenderer.cpp
@@ -195,6 +195,7 @@ GameRenderer::~GameRenderer()
 {
 	if(rainXa != nullptr) delete [] rainXa;
 	if(rainZa != nullptr) delete [] rainZa;
+	delete random;
 }
 
 void GameRenderer::tick(bool first)		// 4J - add bFirst
diff --git a/Minecraft.Client/GuiParticles.cpp b/Minecraft.Client/GuiParticles.cpp
index 0527f531..b79ec67a 100644
--- a/Minecraft.Client/GuiParticles.cpp
+++ b/Minecraft.Client/GuiParticles.cpp
@@ -7,6 +7,15 @@ GuiParticles::GuiParticles(Minecraft *mc)
 	this->mc = mc;
 }
 
+GuiParticles::~GuiParticles()
+{
+    for (GuiParticle *gp : particles)
+    {
+        delete gp;
+    }
+    particles.clear();
+}
+
 void GuiParticles::tick()
 {
     for (unsigned int i = 0; i < particles.size(); i++)
@@ -18,6 +27,7 @@ void GuiParticles::tick()
 
         if (gp->removed)
 		{
+            delete gp;
             particles.erase(particles.begin()+i);
 			i--;
         }
diff --git a/Minecraft.Client/GuiParticles.h b/Minecraft.Client/GuiParticles.h
index 0fe31811..cbfc089d 100644
--- a/Minecraft.Client/GuiParticles.h
+++ b/Minecraft.Client/GuiParticles.h
@@ -13,6 +13,7 @@ private:
 
 public:
 	GuiParticles(Minecraft *mc);
+    ~GuiParticles();
     void tick();
     void add(GuiParticle *guiParticle);
     void render(float a);
diff --git a/Minecraft.Client/LightningBoltRenderer.cpp b/Minecraft.Client/LightningBoltRenderer.cpp
index 65d9bcc1..5a8c781b 100644
--- a/Minecraft.Client/LightningBoltRenderer.cpp
+++ b/Minecraft.Client/LightningBoltRenderer.cpp
@@ -20,7 +20,8 @@ void LightningBoltRenderer::render(shared_ptr<Entity> _bolt, double x, double y,
     double xOff = 0;
     double zOff = 0;
     {
-        Random *random = new Random(bolt->seed);
+        Random randomObj(bolt->seed);
+        Random *random = &randomObj;
         for (int h = 7; h >= 0; h--)
 		{
             xOffs[h] = xOff;
@@ -32,7 +33,8 @@ void LightningBoltRenderer::render(shared_ptr<Entity> _bolt, double x, double y,
 
     for (int r = 0; r < 4; r++)
 	{
-        Random *random = new Random(bolt->seed);
+        Random randomObj(bolt->seed);
+        Random *random = &randomObj;
         for (int p = 0; p < 3; p++)
 		{
             int hs = 7;
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 686e9eec..372fda36 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -505,9 +505,10 @@ LevelStorageSource *Minecraft::getLevelSource()
 
 void Minecraft::setScreen(Screen *screen)
 {
-	if (this->screen != nullptr)
+	Screen *oldScreen = this->screen;
+	if (oldScreen != nullptr)
 	{
-		this->screen->removed();
+		oldScreen->removed();
 	}
 
 #ifdef _WINDOWS64
diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp
index feb0323d..be7c52f0 100644
--- a/Minecraft.Client/Screen.cpp
+++ b/Minecraft.Client/Screen.cpp
@@ -19,6 +19,18 @@ Screen::Screen()	// 4J added
 	clickedButton = nullptr;
 }
 
+Screen::~Screen()
+{
+	delete particles;
+	particles = nullptr;
+
+	for (Button *button : buttons)
+	{
+		delete button;
+	}
+	buttons.clear();
+}
+
 void Screen::render(int xm, int ym, float a)
 {
 	for (Button* button : buttons)
diff --git a/Minecraft.Client/Screen.h b/Minecraft.Client/Screen.h
index 6b2cb945..04f9296d 100644
--- a/Minecraft.Client/Screen.h
+++ b/Minecraft.Client/Screen.h
@@ -22,6 +22,7 @@ public:
 	GuiParticles *particles;
 
 	Screen();		// 4J added
+    virtual ~Screen();
     virtual void render(int xm, int ym, float a);
 protected:
 	virtual void keyPressed(wchar_t eventCharacter, int eventKey);
diff --git a/Minecraft.World/AABB.cpp b/Minecraft.World/AABB.cpp
index 7f294752..52da6552 100644
--- a/Minecraft.World/AABB.cpp
+++ b/Minecraft.World/AABB.cpp
@@ -53,10 +53,16 @@ AABB *AABB::newPermanent(double x0, double y0, double z0, double x1, double y1,
 
 void AABB::clearPool()
 {
+	ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(tlsIdx));
+	if (tls != nullptr)
+	{
+		tls->poolPointer = 0;
+	}
 }
 
 void AABB::resetPool()
 {
+	clearPool();
 }
 
 AABB *AABB::newTemp(double x0, double y0, double z0, double x1, double y1, double z1)
diff --git a/Minecraft.World/Vec3.cpp b/Minecraft.World/Vec3.cpp
index cc8e6741..e7ab19b6 100644
--- a/Minecraft.World/Vec3.cpp
+++ b/Minecraft.World/Vec3.cpp
@@ -46,10 +46,16 @@ Vec3 *Vec3::newPermanent(double x, double y, double z)
 
 void Vec3::clearPool()
 {
+	ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(tlsIdx));
+	if (tls != nullptr)
+	{
+		tls->poolPointer = 0;
+	}
 }
 
 void Vec3::resetPool()
 {
+	clearPool();
 }
 
 Vec3 *Vec3::newTemp(double x, double y, double z)