cleanup and making react demo work like sim