Removing things, fixing demo