Get rid of TDBadgedCell (for now)
closes #15