w.2, clean up