NextTarget cleanup