I have read various recommendations that if you are doing a full tear down, to remove all the rivets (factory assembled) and replace with bolts. Particularly for the battery tray, running board brackets, etc.
I haven't started on replacing my bent battery tray and running brackets yet. P.O. got into several bumps and scrapes in his farm truck!