Getting rid of debug code