type and table clean up.