Remove unused imports, added missing annotations