Finally remove the DAO class