Cleanup session on save. Ref #15