Fixed minor issues (unused imports)