Minor clean

Some global variables seems not necessary any more.
Probably left from old code.