HVAC_Server : more code cleanup