Vertex manager clean integration

VertexManager use clean and some bug fix.
Sorry for my inattention, it would work well now