Remove old thread code

Change-Id: I8aaf92d6fe3ad21853fb21d11c98d889d54953d5
Fix typo in debug logging

Change-Id: I562b0c13c660bd65f562d3e5003c8f0e8c6a7a04