Remove TODO: drive types confirmed