minor cleanup of commented out stuff

Its not going to be coming back any time soon.  Plus this is what
source control is for.