cleanup and mark v3.1