diff --git a/src/org/apollo/ServerContext.java b/src/org/apollo/ServerContext.java
index 821943c1..b5b99744 100644
--- a/src/org/apollo/ServerContext.java
+++ b/src/org/apollo/ServerContext.java
@@ -45,7 +45,6 @@ public final class ServerContext {
 	/**
 	 * Gets a service. This method is shorthand for {@code getServiceManager().getService(...)}.
 	 * 
-	 * @param <S> The type of service.
 	 * @param clazz The service class.
 	 * @return The service, or {@code null} if it could not be found.
 	 */
diff --git a/src/org/apollo/ServiceManager.java b/src/org/apollo/ServiceManager.java
index c060a51b..bb107134 100644
--- a/src/org/apollo/ServiceManager.java
+++ b/src/org/apollo/ServiceManager.java
@@ -42,7 +42,6 @@ public final class ServiceManager {
 	/**
 	 * Gets a service.
 	 * 
-	 * @param <S> The type of service.
 	 * @param clazz The service class.
 	 * @return The service.
 	 */
@@ -92,7 +91,6 @@ public final class ServiceManager {
 	/**
 	 * Registers a service.
 	 * 
-	 * @param <S> The type of service.
 	 * @param clazz The service's class.
 	 * @param service The service.
 	 */
diff --git a/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java b/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java
index b6a5079c..a9d9611a 100644
--- a/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java
+++ b/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java
@@ -28,7 +28,6 @@ public final class MessageHandlerChainGroup {
 	/**
 	 * Gets a {@link MessageHandlerChain} from this group.
 	 * 
-	 * @param <M> The type of message.
 	 * @param clazz The message class.
 	 * @return The {@link MessageHandlerChain} if one was found, {@code null} otherwise.
 	 */
diff --git a/src/org/apollo/game/sync/block/SynchronizationBlockSet.java b/src/org/apollo/game/sync/block/SynchronizationBlockSet.java
index 39f7bc23..32ad95a5 100644
--- a/src/org/apollo/game/sync/block/SynchronizationBlockSet.java
+++ b/src/org/apollo/game/sync/block/SynchronizationBlockSet.java
@@ -52,7 +52,6 @@ public final class SynchronizationBlockSet implements Cloneable {
 	/**
 	 * Gets a {@link SynchronizationBlock} from this set.
 	 * 
-	 * @param <T> The type of block.
 	 * @param clazz The block's class.
 	 * @return The block.
 	 */
diff --git a/src/org/apollo/util/EnumerationUtil.java b/src/org/apollo/util/EnumerationUtil.java
index 9013e244..eed4b348 100644
--- a/src/org/apollo/util/EnumerationUtil.java
+++ b/src/org/apollo/util/EnumerationUtil.java
@@ -14,7 +14,6 @@ public final class EnumerationUtil {
 	/**
 	 * Returns an {@link Iterator} which wraps around the specified {@link Enumeration}.
 	 * 
-	 * @param <E> The type of object that is iterated over.
 	 * @param enumeration The {@link Enumeration}.
 	 * @return An {@link Iterator}.
 	 */
diff --git a/src/org/apollo/util/plugin/PluginContext.java b/src/org/apollo/util/plugin/PluginContext.java
index a33fe386..46f62063 100644
--- a/src/org/apollo/util/plugin/PluginContext.java
+++ b/src/org/apollo/util/plugin/PluginContext.java
@@ -66,7 +66,6 @@ public final class PluginContext {
 	/**
 	 * Adds a {@link MessageHandler} to the end of the chain.
 	 * 
-	 * @param <M> The type of message.
 	 * @param message The message.
 	 * @param handler The handler.
 	 */