Code clean-up on DAO defs