Cleanup code, remove sleep, fix server config class