Indicator clean up

Removed duplicate code that should have been cleaned up last indicator
check-in.