#2, remove last popups from service code, again