minor fixes
strip out specific triggers