wda2: cleaning up, again