Remove redundant static demo file
Fix demo irregularities
Updated header and fixed demo