Remove enable / disable echo from global state