Removing rest of debug code