Merge "Remove dead Activator code"