Heater delete & battery relocate gimmicks