Cleanup code for setting addresses, moved code to deployment module