I just noticed this changes and I just noticed that the tremendous amount of cleanup work that this will now require.

Can we rollback these changes until the import script is improved to assign the addresses to the buildings rather than creating superfluous nodes?