[demo] cleanup