diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 7a0de01ca..8f362483a 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -16,4 +16,4 @@ RUN sudo apt-get -q update && \
     sudo apt install -yq openjdk-8-jdk openjdk-16-jdk
 
 # This is so that you can use java 8 until such a time as you switch to java 16
-RUN sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
+RUN sudo update-java-alternatives --set java-1.16.0-openjdk-amd64
diff --git a/src/main/java/dan200/computercraft/shared/util/FixedPointTileEntityType.java b/src/main/java/dan200/computercraft/shared/util/FixedPointTileEntityType.java
deleted file mode 100644
index 93c86b179..000000000
--- a/src/main/java/dan200/computercraft/shared/util/FixedPointTileEntityType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-///*
-// * This file is part of ComputerCraft - http://www.computercraft.info
-// * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
-// * Send enquiries to dratcliffe@gmail.com
-// */
-//package dan200.computercraft.shared.util;
-//
-//import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
-//import net.minecraft.block.Block;
-//import net.minecraft.block.BlockState;
-//import net.minecraft.block.entity.BlockEntity;
-//import net.minecraft.block.entity.BlockEntityType;
-//import net.minecraft.util.math.BlockPos;
-//
-//import javax.annotation.Nonnull;
-//import java.util.Collections;
-//import java.util.function.Supplier;
-//
-///**
-// * A {@link BlockEntityType} whose supplier uses itself as an argument.
-// *
-// * @param <T> The type of the produced tile entity.
-// */
-//public final class FixedPointTileEntityType<T extends BlockEntity> extends BlockEntityType<T>
-//{
-//    private final Supplier<? extends Block> block;
-//
-//    private FixedPointTileEntityType( Supplier<? extends Block> block, FabricBlockEntityTypeBuilder.Factory<T> builder )
-//    {
-//        super(builder, Collections.emptySet(), null );
-//        this.block = block;
-//    }
-//
-//    public static <T extends BlockEntity> FixedPointTileEntityType<T> create( Supplier<? extends Block> block, FixedPointBlockEntitySupplier<T> builder )
-//    {
-//        return new FixedPointSupplier<>( block, builder ).factory;
-//    }
-//
-//    @Override
-//    public boolean supports( @Nonnull BlockState block )
-//    {
-//        return block.getBlock() == this.block.get();
-//    }
-//
-//    public Block getBlock()
-//    {
-//        return block.get();
-//    }
-//
-//    private static final class FixedPointSupplier<T extends BlockEntity> implements FabricBlockEntityTypeBuilder.Factory<T>
-//    {
-//        final FixedPointTileEntityType<T> factory;
-//        private final FixedPointBlockEntitySupplier<T> builder;
-//
-//        private FixedPointSupplier( Supplier<? extends Block> block, FixedPointBlockEntitySupplier<T> builder )
-//        {
-//            factory = new FixedPointTileEntityType<>( block, this );
-//            this.builder = builder;
-//        }
-//
-//        @Nonnull
-//        @Override
-//        public T create(@Nonnull BlockPos pos, @Nonnull BlockState state )
-//        {
-//            return builder.create( factory, pos, state );
-//        }
-//    }
-//
-//    @FunctionalInterface
-//    public interface FixedPointBlockEntitySupplier<T extends BlockEntity>
-//    {
-//        T create( BlockEntityType<T> type, BlockPos pos, BlockState state );
-//    }
-//}