PortalKit: finish clean roughly