General cleanup before demo