Clean up Threading.cs