Removed references to some output variables that are now in unit-state-monitor.