continuing cleanup from testing