Socket cleanup

@murrekatt do you plan do re-enable that?