#6 : Remove dao usages.