disconnect fixed
removed some unnecessary code