Continue refactoring and remove hacks for old version of heat