Caf Clean up