Remove unneeded use() statement.
Remove unused variables.
Merge pull request #1601 from franzliedke/patch-9

Remove unneeded use() statement.
Merge branch '4.0'