Refactor demo files (client side): remove redundant ones; make sure all use existing...