Remove target trigger index

This branch removes the trigger index logic and related inconsistencies.