Remove unsused namespace + HeatingControl added