Removed threadID dependencies