Cleaned up server start sequence