Streamlined disconnect and fixed hanging threads