Vertex: Cleanup