Cleanup of GetBestTarget and GetBestDroneTarget