Update TargetMovementGenerator, Remove useless code