Removed server implementation from original code