Remove last uses of `popup`