Update to new syntax and removed unused imports.