Remove old demo folder, fixed some merge mistakes