removed unused table and code