chore(dao): bit of cleanup