Controversial end of life care plan to be scrapped