first stage of removing old dao stuff
second stage of removing old dao stuff