More table cleanup