Clean up in Portal sample