Remove unused imports.
Refactoring of decorators.