Clean-Up Thread improvement