architect fix dao
removed not used elements