Removing "care plan"
Added more date parsing