Remove DAODatabase dependency