da/do mess cleanup