Various Improvements/Cleanup

- Less networking
- Less useless globals