Could we remove these debug calls?