remove doo, clean up util and aggregate