Refactor extra social actions to be OO