Partially remove nonterminating table stuff