Removing setCloseConnectionWatch