Merge "Remove unnecessary resource_cleanup/setup"