Clean up and diagrams for User