Make sure cleanup actually removes the markings