cleanup + save more data per vertex