Preparing for removal of GOTOs.