remove the dao layer
Merge branches 'x-dao-layer' and 'master'