Remove Threads requirement, cleanup flags