more cleanup v2