CLIO-16722 clean up triggers, add company