diff --git a/annotations/src/io/anuke/annotations/RemoteMethodAnnotationProcessor.java b/annotations/src/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
index 879cf1f202..e361a49fdc 100644
--- a/annotations/src/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
+++ b/annotations/src/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
@@ -21,9 +21,9 @@ import java.util.stream.Collectors;
 /** The annotation processor for generating remote method call code. */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-        "io.anuke.annotations.Annotations.Remote",
-        "io.anuke.annotations.Annotations.WriteClass",
-        "io.anuke.annotations.Annotations.ReadClass",
+    "io.anuke.annotations.Annotations.Remote",
+    "io.anuke.annotations.Annotations.WriteClass",
+    "io.anuke.annotations.Annotations.ReadClass",
 })
 public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Maximum size of each event packet. */
@@ -74,7 +74,6 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
             if(round == 1){
                 //get serializers
                 serializers = new IOFinder().findSerializers(roundEnv);
-
                 //last method ID used
                 int lastMethodID = 0;
                 //find all elements with the Remote annotation
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 32b99070ba..6ac08f0424 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -244,7 +244,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
     @Override
     public String toString(){
-        return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}\n";
+        return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}";
     }
 
     @Override
@@ -570,8 +570,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         movement.y += ya * speed;
         movement.x += xa * speed;
 
-        Vector2 vec = Graphics.world(Vars.control.input(playerIndex).getMouseX(),
-                Vars.control.input(playerIndex).getMouseY());
+        Vector2 vec = Graphics.world(control.input(playerIndex).getMouseX(), control.input(playerIndex).getMouseY());
         pointerX = vec.x;
         pointerY = vec.y;
         updateShooting();
@@ -691,8 +690,8 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                 }
 
             }else if(isShooting()){
-                Vector2 vec = Graphics.world(Vars.control.input(playerIndex).getMouseX(),
-                        Vars.control.input(playerIndex).getMouseY());
+                Vector2 vec = Graphics.world(control.input(playerIndex).getMouseX(),
+                        control.input(playerIndex).getMouseY());
                 pointerX = vec.x;
                 pointerY = vec.y;
 
diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
index 28f26d7f0a..b050285e0d 100644
--- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
@@ -71,9 +71,6 @@ public class FortressGenerator{
         Array<Block> wallsLarge = find(b -> b instanceof Wall && !(b instanceof Door) && b.size == 2);
 
         Block wall = walls.get((int)(difficultyScl * walls.size));
-        Block wallLarge = wallsLarge.get((int)(difficultyScl * walls.size));
-        Drill drill = (Drill) drills.get((int)(difficultyScl * drills.size));
-        Drill powerDrill = (Drill) powerDrills.get((int)(difficultyScl * powerDrills.size));
 
         Turret powerTurret = (Turret) powerTurrets.get((int)(difficultyScl * powerTurrets.size));
         Turret bigTurret = (Turret) turrets.get(Mathf.clamp((int)((difficultyScl+0.2f+gen.random.range(0.2f)) * turrets.size), 0, turrets.size-1));