Cleanup AddressController
Fix Beneficiary Address