Added some junk when I tried to resolve merge conflicts. Also don't need
the generic DAO anymore.