Cleaned up server starting. Should be no run-away starting of too many servers now.