diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h
index a69ea0443e..100eb5a296 100644
--- a/rpcs3/Emu/RSX/GL/GLTextureCache.h
+++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h
@@ -168,7 +168,7 @@ namespace gl
 			}
 			else
 			{
-				ASSERT(managed_texture.get() == nullptr);
+				ASSERT(!managed_texture);
 			}
 
 			flushed = false;
@@ -396,7 +396,7 @@ namespace gl
 		 */
 		void destroy()
 		{
-			if (!is_locked() && pbo_id == 0 && vram_texture == nullptr && m_fence.is_empty() && managed_texture.get() == nullptr)
+			if (!is_locked() && pbo_id == 0 && vram_texture == nullptr && m_fence.is_empty() && !managed_texture)
 				//Already destroyed
 				return;
 
@@ -427,7 +427,7 @@ namespace gl
 
 		bool is_managed() const
 		{
-			return !exists() || managed_texture.get() != nullptr;
+			return !exists() || managed_texture;
 		}
 
 		texture::format get_format() const
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index 9d588b4e0b..9da6ab3b1d 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -539,7 +539,7 @@ VKGSRender::VKGSRender() : GSRender()
 	else
 		m_vertex_cache.reset(new vk::weak_vertex_cache());
 
-	m_shaders_cache.reset(new vk::shader_cache(*m_prog_buffer.get(), "vulkan", "v1.7"));
+	m_shaders_cache.reset(new vk::shader_cache(*m_prog_buffer, "vulkan", "v1.7"));
 
 	open_command_buffer();
 
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h
index a05dc702b3..c9ba5f4948 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.h
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.h
@@ -1965,7 +1965,7 @@ public:
 
 		VkImage& get_image(u32 index) override
 		{
-			return (VkImage&)(*swapchain_images[index].second.get());
+			return (VkImage&)(*swapchain_images[index].second);
 		}
 
 		VkImageLayout get_optimal_present_layout() override
diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h
index ff3bfab865..bdc42d512d 100644
--- a/rpcs3/Emu/RSX/VK/VKTextureCache.h
+++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h
@@ -88,7 +88,7 @@ namespace vk
 
 		void release_dma_resources()
 		{
-			if (dma_buffer.get() != nullptr)
+			if (dma_buffer)
 			{
 				dma_buffer.reset();
 
@@ -108,7 +108,7 @@ namespace vk
 			m_tex_cache->on_section_destroyed(*this);
 
 			vram_texture = nullptr;
-			ASSERT(managed_texture.get() == nullptr);
+			ASSERT(!managed_texture);
 			release_dma_resources();
 
 			baseclass::on_section_resources_destroyed();
@@ -121,7 +121,7 @@ namespace vk
 
 		bool is_managed() const
 		{
-			return !exists() || managed_texture.get() != nullptr;
+			return !exists() || managed_texture;
 		}
 
 		vk::image_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap)
@@ -183,7 +183,7 @@ namespace vk
 				vkCreateEvent(*m_device, &createInfo, nullptr, &dma_fence);
 			}
 
-			if (dma_buffer.get() == nullptr)
+			if (!dma_buffer)
 			{
 				auto memory_type = m_device->get_memory_mapping().host_visible_coherent;
 				dma_buffer.reset(new vk::buffer(*m_device, align(get_section_size(), 256), memory_type, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0));