fix solitaire cleanup