#941: Remove more obsolete global variables