Removed concept of "Allocated Prefix"

Now just uses Aggregated prefix with a source field and an
Advertising Router ID

Also a few other small tidy ups