MNT: Fixed some demos and removed obsolete ones