Removing unused table code see #6709