Cleaned up the endpoints to remove the tags for actual endpoints. The tags now represent the domain in which the endpoint falls into.