partway through cleanup