[mbpi] Portugal cleanup
Merge pull request #21 from monich/portugal

Portugal cleanup