Branch demo_evolio cleanup!