Removed some obsolete/irrelevant indicators.