TableLayout config cleanup