Undoing some more stuff that's not needed 'cause I'm not using Threads
3 files changed