No. I've always maintained the S & X are largely irrelevant. They were critical to put the company on the map, and show the world what an EV can be. Now, with the 3&Y, the S&X are expensive flagship vehicles to showcase the company's technology. But, as far as accelerating the transition to sustainable energy, they don't move the needle.
Model 3 isn't going anywhere. Over 500k units annually and it's an amazing vehicle.
Tesla's next generation vehicle (not called model 2) will be revealed this year. Complete rewrite of how a vehicle is manufactured. Half the factory space, half the manufacturing time and cost. First units will be produced in Austin, followed by Giga Mexico, which should break ground within weeks.