remove unneeded use calls
Merge pull request #3730 from dereuromark/3.0-cleanup

3.0 cleanup