Cleanup from testing