Removed non-activator code