Remove unused hooks and decorators code