Removing Vertex module bc refacoring