Merge "Remove a TODO associate with starting a thread"