Removed TcpServer + program cleanup