Minor clean

Some global variables don't seem necessary any more.
Probably left from old code.