minor clean-up before demo