Cleaned up delete_address method