merged in Vitja's tab removals