Code Cleanup - Remove String Captions in Buttons