Clean up, if asked.

Clean up, if asked.