#941: Remove obsolete global variables