cleanup v3.1