Fix blocks remove and regen