Unbroke terminal build, more cleanup