Merge "Refactor resource cleanup methods in compute.base"