Remove CLIENT logic