valid targets finder cleanup