major cleanup of tab mechanism