Remove Indicator event object, add TODO comments