Update: Relocate the clean up thread thread cancel state.

Update: Relocate the clean up thread thread cancel state.

Relocate the cancel state changes to outside both waits.

I do not like how this is now happening with a thread lock in place.
I will need to do further research and possibly further changes to better handle this.

For now, this is necessary so that when I send an interrupt signal that the clean up thread will cancel properly.