removed unused terminal_intf (nw)
removed TODO comment that shouldn't have ever been committed (nw)