Cleaned up, single server