More table clean up