Remove client logic, add to server