diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index 3c01a90f..fdf4409d 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -555,6 +555,7 @@ Multiple hitboxes per bone
 Potential fix for client concurrency issue
 Debounce attack collisions
 Remove entities on death
+Remove movement restriction on attack
 
 
 # TODO
diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
index 1cb4e76b..f4d6352e 100644
--- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
+++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
@@ -17,7 +17,6 @@ import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.equip.ServerEquipState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
-import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
 import electrosphere.entity.state.rotator.ServerRotatorTree;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
@@ -35,7 +34,6 @@ import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.net.synchronization.enums.FieldIdEnums;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.server.datacell.Realm;
-import electrosphere.util.math.MathUtils;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -226,15 +224,6 @@ public class ServerAttackTree implements BehaviorTree {
                     currentMoveCanHold = currentMove.getHoldState() != null;
                     //clear collided list
                     this.collidedEntities.clear();
-                    //stop movement tree
-                    if(parent.containsKey(EntityDataStrings.SERVER_MOVEMENT_BT)){
-                        BehaviorTree movementTree = CreatureUtils.serverGetEntityMovementTree(parent);
-                        if(movementTree instanceof ServerGroundMovementTree){
-                            ((ServerGroundMovementTree)movementTree).interrupt();
-                        }
-                    }
-                    Vector3d movementVector = CreatureUtils.getFacingVector(parent);
-                    EntityUtils.getRotation(parent).rotationTo(MathUtils.getOriginVector(), new Vector3d(movementVector.x,movementVector.y,movementVector.z));
                     frameCurrent = 0;
                 } else {
                     this.setState(AttackTreeState.IDLE);
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
index 0253fcc8..bb570205 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
@@ -16,8 +16,6 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.AnimationPriorities;
-import electrosphere.entity.state.attack.ClientAttackTree;
-import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.movement.FallTree;
 import electrosphere.entity.state.movement.SprintTree;
@@ -424,9 +422,6 @@ public class ClientGroundMovementTree implements BehaviorTree {
     
     public boolean canStartMoving(){
         boolean rVal = true;
-        if(parent.containsKey(EntityDataStrings.TREE_CLIENTATTACKTREE) && ((ClientAttackTree)parent.getData(EntityDataStrings.TREE_CLIENTATTACKTREE)).getState() != AttackTreeState.IDLE){
-            rVal = false;
-        }
         return rVal;
     }
 
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
index 9a7ebc3e..f2f848ce 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
@@ -15,8 +15,6 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.AnimationPriorities;
-import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
-import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.movement.ServerFallTree;
 import electrosphere.entity.state.movement.ServerSprintTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing;
@@ -435,9 +433,6 @@ public class ServerGroundMovementTree implements BehaviorTree {
     
     public boolean canStartMoving(){
         boolean rVal = true;
-        if(parent.containsKey(EntityDataStrings.TREE_SERVERATTACKTREE) && ((ServerAttackTree)parent.getData(EntityDataStrings.TREE_SERVERATTACKTREE)).getState() != AttackTreeState.IDLE){
-            rVal = false;
-        }
         return rVal;
     }