continuing cleanup