Removal of debug code