Cleaned up NodeServer and NodeClient