Removing DAO that should belong to other branch