Remove as_old_location methods
They were incorrect if there were periods in the org or name.