Remove some code commented out for ages and comments where it is already 
obvious what we're going to do.

svn path=/branches/work/kgpg2/; revision=764417