Clean up upgradeablePortals plugin

Nothing fancy, just some cleaning.