cleanup of testing code