Cleanup before demo update