Further social-binding cleanup
15 files changed