Portal creation/removing heavily improved - removed unrequired checks and swapped for more reliable ones.