Remove unused import
Fix tables design