Additional cleanup.