Update and remove some demo scripts