BUG-429: Remove invalid activator references

Change-Id: Ibc1471a60f8411251f938ab8f39e0ec22eff60f8
Signed-off-by: Robert Varga <rovarga@cisco.com>