[MRH/SB][81377330] remove mixin from AG

Replace method calls with event-based approach