updated cleanup