Clean up for sharing