Update comments; Remove demo file include