Add Cleanup behavior for pivot