diff --git a/src/core/ctlr.c b/src/core/ctlr.c
index ca985c9..f92dbd5 100644
--- a/src/core/ctlr.c
+++ b/src/core/ctlr.c
@@ -73,7 +73,7 @@ static void set_formatted(H3270 *hSession, int state);
 static void ctlr_blanks(H3270 *session);
 static void	ctlr_half_connect(H3270 *session, int ignored, void *dunno);
 static void	ctlr_connect(H3270 *session, int ignored, void *dunno);
-static void ticking_stop(H3270 *session);
+//static void ticking_stop(H3270 *session);
 static void ctlr_add_ic(H3270 *session, int baddr, unsigned char ic);
 
 /**
@@ -286,7 +286,7 @@ static void update_formatted(H3270 *hSession)
 ///
 static void ctlr_half_connect(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno))
 {
-	ticking_start(hSession,True);
+	hSession->cbk.set_timer(hSession,1);
 }
 
 ///
@@ -294,8 +294,9 @@ static void ctlr_half_connect(H3270 *hSession, int GNUC_UNUSED(ignored), void GN
 ///
 static void ctlr_connect(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno))
 {
-	ticking_stop(hSession);
-	status_untiming(hSession);
+	hSession->cbk.set_timer(hSession,0);
+//	ticking_stop(hSession);
+//	status_untiming(hSession);
 
 	if (hSession->ever_3270)
 		hSession->ea_buf[-1].fa = FA_PRINTABLE | FA_MODIFY;
@@ -1181,7 +1182,7 @@ enum pds ctlr_write(H3270 *hSession, unsigned char buf[], int buflen, Boolean er
 	}
 	wcc_keyboard_restore = WCC_KEYBOARD_RESTORE(buf[1]);
 	if (wcc_keyboard_restore)
-		ticking_stop(hSession);
+		hSession->cbk.set_timer(hSession,0);
 
 	if (wcc_keyboard_restore)
 	{
@@ -2676,21 +2677,21 @@ void mdt_clear(H3270 *hSession, int baddr)
 }
 
 #if defined(X3270_DBCS) /*[*/
-/*
- * DBCS state query.
- * Returns:
- *  DBCS_NONE:	Buffer position is SBCS.
- *  DBCS_LEFT:	Buffer position is left half of a DBCS character.
- *  DBCS_RIGHT:	Buffer position is right half of a DBCS character.
- *  DBCS_SI:    Buffer position is the SI terminating a DBCS subfield (treated
- *		as DBCS_LEFT for wide cursor tests)
- *  DBCS_SB:	Buffer position is an SBCS character after an SI (treated as
- *		DBCS_RIGHT for wide cursor tests)
+/**
+ * @brief DBCS state query.
  *
  * Takes line-wrapping into account, which probably isn't done all that well.
+ *
+ * @return DBCS state
+ *
+ * @retval DBCS_NONE	Buffer position is SBCS.
+ * @retval DBCS_LEFT	Buffer position is left half of a DBCS character.
+ * @retval DBCS_RIGHT:	Buffer position is right half of a DBCS character.
+ * @retval DBCS_SI    	Buffer position is the SI terminating a DBCS subfield (treated as DBCS_LEFT for wide cursor tests)
+ * @retval DBCS_SB		Buffer position is an SBCS character after an SI (treated as DBCS_RIGHT for wide cursor tests)
+ *
  */
-enum dbcs_state
-ctlr_dbcs_state(int baddr)
+enum dbcs_state ctlr_dbcs_state(int baddr)
 {
 	return dbcs? ea_buf[baddr].db: DBCS_NONE;
 }
@@ -2708,6 +2709,7 @@ ctlr_dbcs_state(int baddr)
 //static void * tick_id;
 //static struct timeval t_want;
 
+/*
 /// @brief Return the difference in milliseconds between two timevals.
 static long delta_msec(struct timeval *t1, struct timeval *t0)
 {
@@ -2731,7 +2733,9 @@ static int keep_ticking(H3270 *hSession)
 
 	return 1;
 }
+*/
 
+/*
 void ticking_start(H3270 *hSession, Boolean anyway)
 {
 	CHECK_SESSION_HANDLE(hSession);
@@ -2761,7 +2765,9 @@ void ticking_start(H3270 *hSession, Boolean anyway)
 	}
 
 }
+*/
 
+/*
 static void ticking_stop(H3270 *hSession)
 {
 	CHECK_SESSION_HANDLE(hSession);
@@ -2787,3 +2793,4 @@ static void ticking_stop(H3270 *hSession)
 		status_timing(hSession,&hSession->t_start, &t1);
 	}
 }
+*/
diff --git a/src/core/keyboard/kybd.c b/src/core/keyboard/kybd.c
index c43158d..8f478dc 100644
--- a/src/core/keyboard/kybd.c
+++ b/src/core/keyboard/kybd.c
@@ -505,7 +505,7 @@ static void key_AID(H3270 *hSession, unsigned char aid_code)
 
 	hSession->aid = aid_code;
 	ctlr_read_modified(hSession, hSession->aid, False);
-	ticking_start(hSession,False);
+	hSession->cbk.set_timer(hSession,1);
 	status_ctlr_done(hSession);
 }
 
diff --git a/src/core/screen.c b/src/core/screen.c
index 93b24a7..ede5cd3 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -733,6 +733,7 @@ static void status_printer(H3270 *session, int on, void *dunno)
 }
 */
 
+/*
 void status_timing(H3270 GNUC_UNUSED(*session), struct timeval GNUC_UNUSED(*t0), struct timeval GNUC_UNUSED(*t1))
 {
 }
@@ -744,6 +745,7 @@ void status_untiming(H3270 *session)
 	if(session->cbk.set_timer)
 		session->cbk.set_timer(session,0);
 }
+*/
 
 /*
 static int logpopup(H3270 *session, void *widget, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg)
diff --git a/src/include/ctlrc.h b/src/include/ctlrc.h
index cfed95a..9a3b30f 100644
--- a/src/include/ctlrc.h
+++ b/src/include/ctlrc.h
@@ -71,17 +71,17 @@ LIB3270_INTERNAL void update_model_info(H3270 *session, unsigned int model, unsi
 LIB3270_INTERNAL void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr);
 LIB3270_INTERNAL void ctlr_erase(H3270 *session, int alt);
 
-LIB3270_INTERNAL void ticking_start(H3270 *session, Boolean anyway);
+// LIB3270_INTERNAL void ticking_start(H3270 *session, Boolean anyway);
 
 enum dbcs_state {
-	DBCS_NONE = 0,		/**< position is not DBCS */
-	DBCS_LEFT,			/**< position is left half of DBCS character */
-	DBCS_RIGHT,			/**< position is right half of DBCS character */
-	DBCS_SI,			/**< position is SI terminating DBCS subfield */
-	DBCS_SB,			/**< position is SBCS character after the SI */
-	DBCS_LEFT_WRAP,		/**< position is left half of split DBCS */
-	DBCS_RIGHT_WRAP,	/**< position is right half of split DBCS */
-	DBCS_DEAD			/**< position is dead left-half DBCS */
+	DBCS_NONE = 0,		///< @brief position is not DBCS
+	DBCS_LEFT,			///< @brief position is left half of DBCS character
+	DBCS_RIGHT,			///< @brief position is right half of DBCS character
+	DBCS_SI,			///< @brief position is SI terminating DBCS subfield
+	DBCS_SB,			///< @brief position is SBCS character after the SI
+	DBCS_LEFT_WRAP,		///< @brief position is left half of split DBCS
+	DBCS_RIGHT_WRAP,	///< @brief position is right half of split DBCS
+	DBCS_DEAD			///< @brief position is dead left-half DBCS
 };
 #define IS_LEFT(d)	((d) == DBCS_LEFT || (d) == DBCS_LEFT_WRAP)
 #define IS_RIGHT(d)	((d) == DBCS_RIGHT || (d) == DBCS_RIGHT_WRAP)
diff --git a/src/include/statusc.h b/src/include/statusc.h
index 4de299a..5a06d1b 100644
--- a/src/include/statusc.h
+++ b/src/include/statusc.h
@@ -30,8 +30,8 @@
 LIB3270_INTERNAL void 		status_compose(int on, unsigned char c, enum keytype keytype);
 LIB3270_INTERNAL void 		status_ctlr_done(H3270 *session);
 
-LIB3270_INTERNAL void 		status_timing(H3270 *session, struct timeval *t0, struct timeval *t1);
-LIB3270_INTERNAL void 		status_untiming(H3270 *session);
+// LIB3270_INTERNAL void 		status_timing(H3270 *session, struct timeval *t0, struct timeval *t1);
+// LIB3270_INTERNAL void 		status_untiming(H3270 *session);
 
 LIB3270_INTERNAL void 		status_lu(H3270 *session, const char *);
 LIB3270_INTERNAL void 		status_oerr(H3270 *session, int error_type);
--
libgit2 0.21.2