Cleanup
Removes obsolete threading code