Cj cleanup