Server changes
Removed a few thread spin-ups to avoid errors