Remove furnace workaround