Remove commented code inside the virtual stream model