removed leaving_date from user