Refactor completed, Richconsole TCPServer usage is left