refactoring: removed triggers