Fixed regression related to indicator types
Code cleanup: removed unused classes
Code cleanup: removed unused search classes