Renamed coreTrigger to __trigger. More generic cleanup