Autocal clean up