Cleanup Code, add new disconnect method for TCP connection