CLIO-16722 clean up triggers & actions