Remove comments & Class_Diagram_Server