diff --git a/src/Image.cpp b/src/Image.cpp
index 0238ca69..34c4a4c5 100644
--- a/src/Image.cpp
+++ b/src/Image.cpp
@@ -283,7 +283,6 @@ Image::recordStagingMemoryBarrier(const vk::CommandBuffer& commandBuffer,
                                    vk::ImageLayout::eGeneral);
 }
 
-// FIXME: Make this private.
 void
 Image::recordImageMemoryBarrier(const vk::CommandBuffer& commandBuffer,
                                 const vk::Image& image,
@@ -328,7 +327,6 @@ Image::constructDescriptorImageInfo()
     KP_LOG_DEBUG("Kompute Image construct descriptor image info size {}",
                  this->memorySize());
 
-    // RQ: FIXME: Initilaise these correctly.
     vk::ImageViewCreateInfo viewInfo;
     viewInfo.image = *this->mPrimaryImage;
     viewInfo.format = this->getFormat();
diff --git a/src/OpSyncLocal.cpp b/src/OpSyncLocal.cpp
index a051b816..df73e500 100644
--- a/src/OpSyncLocal.cpp
+++ b/src/OpSyncLocal.cpp
@@ -35,7 +35,6 @@ OpSyncLocal::record(const vk::CommandBuffer& commandBuffer)
             this->mMemObjects[i]->recordPrimaryMemoryBarrier(
               commandBuffer,
               vk::AccessFlagBits::eShaderWrite,
-              // FIXME: eTransferRead is not supported for the compute pipeline
               vk::AccessFlagBits::eTransferRead,
               vk::PipelineStageFlagBits::eComputeShader,
               vk::PipelineStageFlagBits::eTransfer);
@@ -44,7 +43,6 @@ OpSyncLocal::record(const vk::CommandBuffer& commandBuffer)
 
             this->mMemObjects[i]->recordPrimaryMemoryBarrier(
               commandBuffer,
-              // FIXME: eTransferRead is not supported for the compute pipeline
               vk::AccessFlagBits::eTransferWrite,
               vk::AccessFlagBits::eHostRead,
               vk::PipelineStageFlagBits::eTransfer,
diff --git a/src/Tensor.cpp b/src/Tensor.cpp
index bcb0aca0..4659c31e 100644
--- a/src/Tensor.cpp
+++ b/src/Tensor.cpp
@@ -214,7 +214,6 @@ Tensor::recordStagingMemoryBarrier(const vk::CommandBuffer& commandBuffer,
                                     dstStageMask);
 }
 
-// FIXME: Make this private.
 void
 Tensor::recordBufferMemoryBarrier(const vk::CommandBuffer& commandBuffer,
                                   const vk::Buffer& buffer,