After dropping the endpoint I was then able to remove the mapped login. I was so focused on those errors I didn't even think to go drop the endpoint.

Thanks...