intermediate commit for social info refactoring