Remove obsolete variables