What l did after the first stage that is outlined, is got a dremell or similar with a fine blade for masonry, went through quite a few blades mind you and took ages to rake it out minimum 2mm. Regrouted and resealed using stainstop. lt is worth the effort good luck