Remove stupid one-cell table

Change-Id: Ia24c68378385adfd2a5c0bf7b9646bb1edc3d7e4
Merge "Remove stupid one-cell table"