Remove debug code, ignore case where its a new patch