Removing disconnect code