Re-grouting my shower

Just finished clearing the old grout from the shower that started to chipped off. I noticed that the corned is half grouted and half silicon. What the? So I cleaned the corner up so that it can be grouted and then I will apply the silicon on top.
The job took about 1.5 hour to clear the existing grout, then about 4 hours to re-grout it all. This is including the cleaning up of all the tiles after the grout is complete.