Remove more debug code