undo my hack, correctly remove old tab-labels

Signed-off-by: Chris Granger <ibdknox@gmail.com>