Move getStream() into the Stream class directly

Remove unused imports in Factory.