Removed some demos, and small demo fixes