cleanup and we using caf now