Make some cleanup on DAOs