remove again and fix table stuff