Remove ManagedAddress dependency