Feature/indicator data cleanup