Remove wait_status from user