Fix AddressesInWallets

(my branch name should have been fix_AddressesInWallets)
remove PropertyID and Protocol columns;
clean up related foreign keys & indexes as well.