Cleanup and stop frames from committing twice.