Remove reference to Decorators