rm rusty streams and refactoring sidebar