take 2-TestDVD into account for cleanup