Refactoring/cleanup of the telnet applications.