In my view
Getting rid of the discount on right to buy is the first step.
In principle, I have no problem with tenants having the right to buy out their landlords at fair market price.
In the social sector, such income should be ring-fenced to build more social properties.