Revert "Revert "clean up old social stuff""

This reverts commit 799fef1c82eb4c00544d3fe32b56f6154fff5fe4.
Revert "set up storebuffer"

This reverts commit 031868d316efa6a242afc07a71e787116b3e3d47.