Update old demo board files. Minor code cleaning.