Complete teardown in prep for unification with disk cleaner