[mbpi] Portugal cleanup