CLean and updates