Fixed cleanup scripts