Yes - clear away all the caulking. Normally this is hard work, but it is worth the effort.
We used to repair failing caulking with Eternabond tape, and where the caulking would otherwise fail, the Eternabond tape would seem to last what seemed forever.
You can get it at Camping World, but somewhat cheaper on line.
Good luck.