svn: r15496
* remove some commented-out code & lame old code * move GUI code out of demos/ subdirectory svn: r9633