Yup....but purely optional, a gallon of each last me a year....
Please keep asking questions here or pm me, rinseless is the single biggest thing I've ever found in detailing thats saves you time, money and effort without sacrificing effectiveness. Hands-down.