Remove residuals of old stuff