text: Title: Remove dataset dependency
  Body: We should remove the dataset dependency entirely. It's been a source of problem and pain for awhile and it really just seems like we should roll our own solution. 