Remove old indicators for now
Merge branch 'indicators'