Update stuff
Remove some stuff
Prepare for demo