Small amount of Tab Manager cleanup