Remove unused code from Client
Remove unused code from Socket