TF-4728 Delete unused drive picker architecture (#4763)