house cleaning for requirements for commit_store