Upgrade demo to 0.3.0
Cleanup