Merge "Remove a redundent resource_cleanup method"