checkout helper cleanup