diff --git a/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java b/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java
index 6e95b63f..743a2342 100644
--- a/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java
+++ b/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java
@@ -122,13 +122,13 @@ public final class NpcDefinitionDecoder {
 				buffer.getShort();
 			} else if (opcode == 106) {
 				@SuppressWarnings("unused")
-				int morphVariableBitsIndex = wrapMorphism(buffer.getShort());
+				int morphVariableBitsIndex = wrap(buffer.getShort());
 				@SuppressWarnings("unused")
-				int morphismCount = wrapMorphism(buffer.getShort());
+				int morphismCount = wrap(buffer.getShort());
 
 				int count = buffer.get() & 0xFF;
 				int[] morphisms = new int[count + 1];
-				Arrays.setAll(morphisms, index -> wrapMorphism(buffer.getShort()));
+				Arrays.setAll(morphisms, index -> wrap(buffer.getShort()));
 			} else if (opcode == 107) {
 				@SuppressWarnings("unused")
 				boolean clickable = false;
@@ -137,12 +137,12 @@ public final class NpcDefinitionDecoder {
 	}
 
 	/**
-	 * Wraps a morphism value around, returning -1 if the specified value is 65,535. TODO name
+	 * Wraps a morphism value around, returning -1 if the specified value is 65,535.
 	 * 
 	 * @param value The value.
 	 * @return -1 if {@code value} is 65,535, otherwise {@code value}.
 	 */
-	private static int wrapMorphism(int value) {
+	private static int wrap(int value) {
 		return value == 65_535 ? -1 : value;
 	}
 
diff --git a/src/org/apollo/game/model/World.java b/src/org/apollo/game/model/World.java
index f6c566c5..98335a0b 100644
--- a/src/org/apollo/game/model/World.java
+++ b/src/org/apollo/game/model/World.java
@@ -119,7 +119,7 @@ public final class World {
 	private final Map<Long, Player> players = new HashMap<>();
 
 	/**
-	 * The {@link PluginManager}. TODO: better place than here!!
+	 * The {@link PluginManager}.
 	 */
 	private PluginManager pluginManager;
 
@@ -184,7 +184,7 @@ public final class World {
 	}
 
 	/**
-	 * Gets the plugin manager. TODO should this be here?
+	 * Gets the plugin manager.
 	 * 
 	 * @return The plugin manager.
 	 */
@@ -252,8 +252,7 @@ public final class World {
 		scheduler.schedule(npcMovement);
 
 		manager.start();
-		pluginManager = manager; // TODO move!!
-
+		pluginManager = manager;
 	}
 
 	/**
diff --git a/src/org/apollo/game/model/def/ItemDefinition.java b/src/org/apollo/game/model/def/ItemDefinition.java
index 7e175a25..bbbad0c2 100644
--- a/src/org/apollo/game/model/def/ItemDefinition.java
+++ b/src/org/apollo/game/model/def/ItemDefinition.java
@@ -388,7 +388,7 @@ public final class ItemDefinition {
 	public void toNote() {
 		if (isNote()) {
 			if (description != null && description.startsWith("Swap this note at any bank for ")) {
-				return; // already converted TODO better way of checking?
+				return; // already converted.
 			}
 
 			ItemDefinition infoDef = lookup(noteInfoId);
diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java
index 86692430..9c7e8552 100644
--- a/src/org/apollo/game/model/entity/Player.java
+++ b/src/org/apollo/game/model/entity/Player.java
@@ -686,7 +686,7 @@ public final class Player extends Mob {
 	 */
 	public void sendInitialMessages() {
 		blockSet.add(SynchronizationBlock.createAppearanceBlock(this));
-		send(new IdAssignmentMessage(index, members)); // TODO should this be sent when we reconnect?
+		send(new IdAssignmentMessage(index, members));
 		sendMessage("Welcome to RuneScape.");
 
 		int[] tabs = InterfaceConstants.DEFAULT_INVENTORY_TABS;
diff --git a/src/org/apollo/game/model/inv/Inventory.java b/src/org/apollo/game/model/inv/Inventory.java
index 5e9fd664..ac6abbe1 100644
--- a/src/org/apollo/game/model/inv/Inventory.java
+++ b/src/org/apollo/game/model/inv/Inventory.java
@@ -51,7 +51,7 @@ public final class Inventory {
 	/**
 	 * A flag indicating if events are being fired.
 	 */
-	private boolean firingEvents = true; // TODO: make this reentrant
+	private boolean firingEvents = true;
 
 	/**
 	 * The items in this inventory.
diff --git a/src/org/apollo/game/sync/task/PhasedSynchronizationTask.java b/src/org/apollo/game/sync/task/PhasedSynchronizationTask.java
index 020ea7c8..c6b39da0 100644
--- a/src/org/apollo/game/sync/task/PhasedSynchronizationTask.java
+++ b/src/org/apollo/game/sync/task/PhasedSynchronizationTask.java
@@ -38,7 +38,7 @@ public final class PhasedSynchronizationTask extends SynchronizationTask {
 	public void run() {
 		try {
 			task.run();
-		} catch (Exception e) { // TODO better solution...
+		} catch (Exception e) {
 			e.printStackTrace();
 			// The executor suppresses any exceptions thrown as part of the task, so we catch and print here as
 			// rethrowing them does nothing.
diff --git a/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java b/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java
index f147104e..e1cf8263 100644
--- a/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java
+++ b/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java
@@ -18,7 +18,6 @@ public final class ThirdObjectActionMessageDecoder extends MessageDecoder<ThirdO
 
 	@Override
 	public ThirdObjectActionMessage decode(GamePacket packet) {
-		// TODO ripped out of some Winterlove-based server, so probably wrong
 		GamePacketReader reader = new GamePacketReader(packet);
 		int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
 		int y = (int) reader.getUnsigned(DataType.SHORT);
diff --git a/src/org/apollo/net/session/Session.java b/src/org/apollo/net/session/Session.java
index 5ac7108a..734b40e8 100644
--- a/src/org/apollo/net/session/Session.java
+++ b/src/org/apollo/net/session/Session.java
@@ -13,7 +13,7 @@ public abstract class Session {
 	/**
 	 * The channel.
 	 */
-	private final Channel channel;
+	protected final Channel channel;
 
 	/**
 	 * Creates a session for the specified channel.
diff --git a/src/org/apollo/net/session/UpdateSession.java b/src/org/apollo/net/session/UpdateSession.java
index a4233607..ace8d228 100644
--- a/src/org/apollo/net/session/UpdateSession.java
+++ b/src/org/apollo/net/session/UpdateSession.java
@@ -34,7 +34,7 @@ public final class UpdateSession extends Session {
 
 	@Override
 	public void destroy() {
-		// TODO implement
+		channel.close();
 	}
 
 	@Override