Clean up for live