Drive library code cleanup
Open, Needs TriagePublic