Reverted to pre-RealHeat DRE, with some fixes

backported from the RealHeat branch
Remove B9 configs (done by B9)