minor cleanup before demo