To hell with that clean and re-grout crap. I say bulldoze the building and do a total rebuild on a clean site when the site work is completed.
http://www.therightscoop.com/bill-whittle-where-we-go-from-here/