More clean-up of resource class methods