more deletions and started adding DAOs