Merge pull request #1852 from apache/compute-clean

Clean up compute drive (based on top of #1743)