Remove GenericDao
WIP
WIP