Reorganise terminal deps
remove cruft