diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index e936c347c7..1bf12ba4a3 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -6,9 +6,9 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.entities.effect.*;
+import io.anuke.mindustry.entities.effect.Fire;
+import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.traits.TypeTrait;
 import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.game.*;
@@ -241,7 +241,5 @@ public class ContentLoader{
         TypeTrait.registerType(Player.class, Player::new);
         TypeTrait.registerType(Fire.class, Fire::new);
         TypeTrait.registerType(Puddle.class, Puddle::new);
-        TypeTrait.registerType(Bullet.class, Bullet::new);
-        TypeTrait.registerType(Lightning.class, Lightning::new);
     }
 }
diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java
index 24b3e17447..05ea541609 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -251,7 +251,7 @@ public class NetClient implements ApplicationListener{
                 //read the entity
                 entity.read(input);
 
-                if(created && entity.getInterpolator() != null){
+                if(created && entity.getInterpolator() != null && entity.getInterpolator().target != null){
                     //set initial starting position
                     entity.setNet(entity.getInterpolator().target.x, entity.getInterpolator().target.y);
                     if(entity instanceof Unit && entity.getInterpolator().targets.length > 0){
diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
index 2ff39fcc6f..4060376c14 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
@@ -16,11 +16,10 @@ import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Tile;
 
-import java.io.*;
+import static io.anuke.mindustry.Vars.bulletGroup;
+import static io.anuke.mindustry.Vars.world;
 
-import static io.anuke.mindustry.Vars.*;
-
-public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, SyncTrait, AbsorbTrait{
+public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{
     public Interval timer = new Interval(3);
 
     private float lifeScl;
@@ -153,31 +152,6 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
         return type.damage * damageMultiplier();
     }
 
-    @Override
-    public boolean isSyncing(){
-        return type.syncable;
-    }
-
-    @Override
-    public void write(DataOutput data) throws IOException{
-        data.writeFloat(x);
-        data.writeFloat(y);
-        data.writeFloat(velocity.x);
-        data.writeFloat(velocity.y);
-        data.writeByte(team.ordinal());
-        data.writeByte(type.id);
-    }
-
-    @Override
-    public void read(DataInput data) throws IOException{
-        x = data.readFloat();
-        y = data.readFloat();
-        velocity.x = data.readFloat();
-        velocity.y = data.readFloat();
-        team = Team.all[data.readByte()];
-        type = content.bullet(data.readByte());
-    }
-
     @Override
     public Team getTeam(){
         return team;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java
index b3e72ca915..bc842d7d95 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java
@@ -14,18 +14,16 @@ import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.impl.TimedEntity;
-import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.entities.traits.DrawTrait;
+import io.anuke.mindustry.entities.traits.TimeTrait;
 import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-
 import static io.anuke.mindustry.Vars.bulletGroup;
 
-public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, TimeTrait{
+public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
     public static final float lifetime = 10f;
 
     private static final RandomXS128 random = new RandomXS128();
@@ -91,19 +89,6 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
         }
     }
 
-    @Override
-    public boolean isSyncing(){
-        return false;
-    }
-
-    @Override
-    public void write(DataOutput data){
-    }
-
-    @Override
-    public void read(DataInput data){
-    }
-
     @Override
     public float lifetime(){
         return lifetime;