Trimmed out some junk code and fixed some logic in the server start up sequencing