Some Resource Data-Cleanups