Check server was unneeded complexity, removed