Reordering part 3
Remove nf-if/show demos