Cleanup needless (wrong) tab relations correctly (#605)