almost done with cleanup