Remove obsolete global variables