I don't see where we remove old Location objects. We can add this when we combine though.