- Almost - removed all Trigger references