Remove Id tag from demo files
Small improvement to makefile