Added remove after trigger