Clean up Discard Controller