More cleanup in GroupTableModel