Framework changes. Remove demo.