Clean up dual activator (2/33)

Clean up dual activator