restore command-t shortcuts
some command-t cleanup