Getting rid of debug calls