Fix review suggested findings remove