PLF-5235: Clean up resource bundles