tab: more cleanup