Cleaning out deprecations in AbstractResource