diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java
index fd8808909..34c636fc7 100644
--- a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java
+++ b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java
@@ -761,6 +761,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                             throw e;
                         }
                     };
+                    //noinspection unchecked - required at compile time
                     return (T) (Future) queueHandler.sync(chain);
                 } else {
                     if (callback == null) {
diff --git a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks.java
index 00cda1dc7..85ffe7710 100644
--- a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks.java
+++ b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks.java
@@ -673,7 +673,6 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                     }
 
                     syncTasks[1] = () -> {
-                        //TODO 1.18 be a CBT & ListBinaryTag ?
                         for (final CompoundTag nativeTag : entities) {
                             final Map<String, Tag> entityTagMap = nativeTag.getValue();
                             final StringTag idTag = (StringTag) entityTagMap.get("Id");
@@ -769,7 +768,6 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                     Runnable[] finalSyncTasks = syncTasks;
 
                     // Chain the sync tasks and the callback
-                    //TODO 1.18 address raw access
                     Callable<Future> chain = () -> {
                         try {
                             // Run the sync tasks
@@ -791,6 +789,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                             throw e;
                         }
                     };
+                    //noinspection unchecked - required at compile time
                     return (T) (Future) queueHandler.sync(chain);
                 } else {
                     if (callback == null) {
@@ -1089,7 +1088,6 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                     final PalettedContainer<net.minecraft.world.level.block.state.BlockState> blocksExisting = existing.getStates();
 
                     final Object dataObject = PaperweightPlatformAdapter.fieldData.get(blocksExisting);
-                    //TODO this field doesn't exist in 1.18
                     final Palette<BlockState> palette = (Palette<BlockState>) PaperweightPlatformAdapter.fieldPalette.get(
                             dataObject);
                     int paletteSize;
diff --git a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks_Copy.java b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks_Copy.java
index d07b8b9b1..fd0dadb03 100644
--- a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks_Copy.java
+++ b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightGetBlocks_Copy.java
@@ -68,7 +68,6 @@ public class PaperweightGetBlocks_Copy implements IChunkGet {
     }
 
     protected void storeEntity(Entity entity) {
-        //TODO 1.18 address raw access & possibly be a CBT ?
         BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
         net.minecraft.nbt.CompoundTag compoundTag = new net.minecraft.nbt.CompoundTag();
         entities.add((CompoundTag) adapter.toNative(entity.save(compoundTag)));