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