Code cleaning & renaming & temporary drop of (unused anyway) StreamView.