Cleaning up end to end to reflect new facets