Cleanup commit and clear mechanism