Clean up before demo