Merge branch '2019-05-28-master-imports'

- Remove various dead code from DaVinci
- FAT fixes