more cleanup on snap