#860 - clean up FUB demo a bit