much attack/targetting related cleanup
more attack/targeting cleanup