remove old code
renames and fixes
terminalcontrol tests