Remove both server and client first