diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index 2c31c8b140..2e0c79dac6 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -139,8 +139,7 @@ public final class AccessFile {
       return var4;
    }
 
-   @ObfuscatedName("finalize")
-   protected void method22() throws Throwable {
+   protected void finalize() throws Throwable {
       if (this.file != null) {
          System.out.println("");
          this.close();
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index 009146f408..52b20e5d8a 100644
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -101,8 +101,7 @@ public class BufferedNetSocket extends AbstractSocket {
       this.source.close();
    }
 
-   @ObfuscatedName("finalize")
-   protected void method75() {
+   protected void finalize() {
       this.close();
    }
 
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 2908ce3715..7ddf9c29c9 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -36,14 +36,10 @@ public final class Canvas extends java.awt.Canvas {
       this.component = var1;
    }
 
-   @Export("update")
-   @ObfuscatedName("update")
    public final void update(Graphics var1) {
       this.component.update(var1);
    }
 
-   @Export("paint")
-   @ObfuscatedName("paint")
    public final void paint(Graphics var1) {
       this.component.paint(var1);
    }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 86bf250252..d1c68f78df 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -2401,8 +2401,6 @@ public final class Client extends GameShell implements Usernamed {
    protected final void vmethod114() {
    }
 
-   @ObfuscatedName("init")
-   @Export("init")
    public final void init() {
       try {
          if (this.checkHost()) {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index 8d50146343..13c4a648bf 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -113,8 +113,6 @@ public class IterableDualNodeQueue implements Iterable {
       }
    }
 
-   @Export("iterator")
-   @ObfuscatedName("iterator")
    public Iterator iterator() {
       return new IterableDualNodeQueueIterator(this);
    }
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 5f75f3b7e8..c2807689b3 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -36,8 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator {
       this.last = null;
    }
 
-   @Export("next")
-   @ObfuscatedName("next")
    public Object next() {
       DualNode var1 = this.head;
       if (var1 == this.queue.sentinel) {
@@ -51,14 +49,10 @@ public class IterableDualNodeQueueIterator implements Iterator {
       return var1;
    }
 
-   @Export("hasNext")
-   @ObfuscatedName("hasNext")
    public boolean hasNext() {
       return this.queue.sentinel != this.head;
    }
 
-   @ObfuscatedName("remove")
-   @Export("remove")
    public void remove() {
       if (this.last == null) {
          throw new IllegalStateException();
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index f916f30966..ae4f8d3922 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -120,8 +120,6 @@ public class IterableNodeDeque implements Iterable {
       return this.sentinel.previous == this.sentinel;
    }
 
-   @Export("iterator")
-   @ObfuscatedName("iterator")
    public Iterator iterator() {
       return new IterableNodeDequeDescendingIterator(this);
    }
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index 8d81ecf84c..c0d7c1d2f8 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -51,14 +51,10 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
       this.last = null;
    }
 
-   @Export("hasNext")
-   @ObfuscatedName("hasNext")
    public boolean hasNext() {
       return this.deque.sentinel != this.head;
    }
 
-   @Export("next")
-   @ObfuscatedName("next")
    public Object next() {
       Node var1 = this.head;
       if (var1 == this.deque.sentinel) {
@@ -72,8 +68,6 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
       return var1;
    }
 
-   @ObfuscatedName("remove")
-   @Export("remove")
    public void remove() {
       if (this.last == null) {
          throw new IllegalStateException();
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index c56d9b9e2f..52704c5f7b 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -138,8 +138,6 @@ public final class IterableNodeHashTable implements Iterable {
       }
    }
 
-   @Export("iterator")
-   @ObfuscatedName("iterator")
    public Iterator iterator() {
       return new IterableNodeHashTableIterator(this);
    }
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index 3fc7468142..9b6cd186b4 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -46,8 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator {
       this.last = null;
    }
 
-   @Export("next")
-   @ObfuscatedName("next")
    public Object next() {
       Node var1;
       if (this.hashTable.buckets[this.index - 1] != this.head) {
@@ -70,8 +68,6 @@ public class IterableNodeHashTableIterator implements Iterator {
       }
    }
 
-   @Export("hasNext")
-   @ObfuscatedName("hasNext")
    public boolean hasNext() {
       if (this.hashTable.buckets[this.index - 1] != this.head) {
          return true;
@@ -89,8 +85,6 @@ public class IterableNodeHashTableIterator implements Iterator {
       }
    }
 
-   @ObfuscatedName("remove")
-   @Export("remove")
    public void remove() {
       if (this.last == null) {
          throw new IllegalStateException();
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index d788fc95c4..44e9c73062 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -98,8 +98,6 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("crossSprites")
    static Sprite[] crossSprites;
 
-   @Export("keyPressed")
-   @ObfuscatedName("keyPressed")
    public final synchronized void keyPressed(KeyEvent var1) {
       if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
@@ -138,13 +136,9 @@ public final class KeyHandler implements KeyListener, FocusListener {
 
    }
 
-   @Export("focusGained")
-   @ObfuscatedName("focusGained")
    public final void focusGained(FocusEvent var1) {
    }
 
-   @Export("focusLost")
-   @ObfuscatedName("focusLost")
    public final synchronized void focusLost(FocusEvent var1) {
       if (KeyHandler_instance != null) {
          field448 = -1;
@@ -152,8 +146,6 @@ public final class KeyHandler implements KeyListener, FocusListener {
 
    }
 
-   @Export("keyReleased")
-   @ObfuscatedName("keyReleased")
    public final synchronized void keyReleased(KeyEvent var1) {
       if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
@@ -175,8 +167,6 @@ public final class KeyHandler implements KeyListener, FocusListener {
       var1.consume();
    }
 
-   @Export("keyTyped")
-   @ObfuscatedName("keyTyped")
    public final void keyTyped(KeyEvent var1) {
       if (KeyHandler_instance != null) {
          char var2 = var1.getKeyChar();
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index 7334e28bc0..b12f32a887 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -181,8 +181,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 
    }
 
-   @Export("mouseClicked")
-   @ObfuscatedName("mouseClicked")
    public final void mouseClicked(MouseEvent var1) {
       if (var1.isPopupTrigger()) {
          var1.consume();
@@ -190,8 +188,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 
    }
 
-   @Export("mouseExited")
-   @ObfuscatedName("mouseExited")
    public final synchronized void mouseExited(MouseEvent var1) {
       if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java
index 008e033335..758d0dce83 100644
--- a/runescape-client/src/main/java/MouseWheelHandler.java
+++ b/runescape-client/src/main/java/MouseWheelHandler.java
@@ -53,8 +53,6 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener {
       return var1;
    }
 
-   @Export("mouseWheelMoved")
-   @ObfuscatedName("mouseWheelMoved")
    public synchronized void mouseWheelMoved(MouseWheelEvent var1) {
       this.rotation += var1.getWheelRotation();
    }
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index 867629e386..7402ba2cab 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -293,8 +293,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 
    }
 
-   @Export("finalize")
-   @ObfuscatedName("finalize")
    protected void finalize() {
       this.close();
    }
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index 4a855b6eb9..974aa225d5 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -11,8 +11,6 @@ public class SecureRandomCallable implements Callable {
    @Export("indexedSpriteHeights")
    static int[] indexedSpriteHeights;
 
-   @Export("call")
-   @ObfuscatedName("call")
    public Object call() {
       return AttackOption.method2034();
    }