Cleanup TargetWorker logic