Check port when removing self referenced routes

* Cleanup how self referenced routes were determined
Merge pull request #46 from fraenkel/self_reference

Check port when removing self referenced routes