Debug functions removed