Tabbar tweaks; remove old stuff