Remove unnecessary dao code