Cleanup of an unused global variable. Moved more global variables to globals infrastructure. Introduction of a 'System' group.