Cleaned everything up. Removed the table term and table type.