Category : cleanup activation code