Merge "Remove redundand definitions for kaas triggers"