Remove deprecated stream classes
Remove unused imports from tests