Optimize / clean up server disconnect method