HOPKINS: Remove the last GOTOs