PLF-5235 Cleanup resource bundles