While Panel Prep is not specifically designed to remove water spots, its highly effective cleaning formula can help to remove them if they are not too deeply ingrained. For more stubborn water spots, it is recommended to use a dedicated water spot remover before using Panel Prep for thorough surface preparation.